10097 Commits

Author	SHA1	Message	Date
Laurent Destailleur	aaeb7dc9d6	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/holiday.php htdocs/comm/propal/list.php htdocs/commande/list.php htdocs/filefunc.inc.php htdocs/product/list.php	2019-05-10 17:45:33 +02:00
John BOTELLA	f296093f8d	fix travis	2019-05-10 15:52:46 +02:00
Laurent Destailleur	9de0e69456	FIX column project into list	2019-05-10 15:11:06 +02:00
Laurent Destailleur	5625c94c44	Fix missing label on project tooltip	2019-05-10 14:40:15 +02:00
Laurent Destailleur	0e8184332e	Fix missing label on project tooltip	2019-05-10 14:39:05 +02:00
Laurent Destailleur	6cb96b926b	Fix phpcs	2019-05-09 21:34:22 +02:00
Laurent Destailleur	78c4a3cced	Fix lang	2019-05-09 18:33:50 +02:00
Laurent Destailleur	a94c291b76	Dolibarization	2019-05-09 16:59:06 +02:00
Laurent Destailleur	3bf162dcd6	Clean code for v10	2019-05-09 14:36:48 +02:00
Laurent Destailleur	74875690a0	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/actions_massactions.inc.php htdocs/core/tpl/massactions_pre.tpl.php	2019-05-08 19:14:31 +02:00
Laurent Destailleur	f6de2d091d	FIX Sending email to mass actions send same email on same customer	2019-05-08 19:07:12 +02:00
Laurent Destailleur	1e036f3513	Correct support for type price on module builder ... Fix link of ref in cash fence list	2019-05-08 01:09:38 +02:00
Francis Appels	03e2983d40	Merge branch 'develop' into clean_10_beta	2019-05-06 15:22:27 +02:00
ptibogxiv	c94e621059	FIX : facnumber to ref report takepos	2019-05-04 17:23:57 +02:00
Laurent Destailleur	64fb7bd1c2	Merge pull request #11103 from grandoc/new_branch_02_05_2019 ... inactive a var_dump	2019-05-03 02:29:25 +02:00
Philippe GRAND	bcd96ba8d6	inactive a var_dump	2019-05-02 14:42:02 +02:00
Laurent Destailleur	4f9ea912ab	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/website.inc.php	2019-05-02 14:41:56 +02:00
Laurent Destailleur	e2c7c0574e	Merge pull request #11086 from andreubisquerra/master ... NEW Add history to view and print previous sales on TakePos.	2019-05-02 14:04:57 +02:00
Ferran Marcet	be17e31be1	New: Add ref_client field on template invoice	2019-05-02 11:04:55 +02:00
Francis Appels	18c5c586ab	Cleanup set_draft in syslog	2019-05-01 09:38:27 +02:00
Laurent Destailleur	9c45b781af	Fix balance of colspan	2019-04-30 16:44:11 +02:00
Laurent Destailleur	2136bce4b0	FIX missing situation invoice in list	2019-04-30 15:10:38 +02:00
andreubisquerra	00db274956	Add history to view and print previous sales.	2019-04-28 18:12:33 +02:00
Ferran Marcet	7a651b5071	New: Add ref_client field on template invoice	2019-04-26 13:53:22 +02:00
Laurent Destailleur	091132de2f	Signatures of methods createFromClone() has been standardized. All ... methods requires the object User as first parameter.	2019-04-25 12:11:32 +02:00
Alexandre SPANGARO	9210a39f6a	Merge branch 'develop' into 10.0_accountancy2	2019-04-24 21:49:41 +02:00
Laurent Destailleur	3b04d2fe9b	Fix warnings	2019-04-23 13:21:17 +02:00
Laurent Destailleur	7f4b09c482	Fix warnings	2019-04-23 13:20:44 +02:00
Laurent Destailleur	4d92d7731c	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/sendings.lib.php htdocs/langs/en_US/admin.lang htdocs/theme/eldy/style.css.php	2019-04-23 12:32:08 +02:00
Laurent Destailleur	84ec39f043	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-04-23 12:25:53 +02:00
Laurent Destailleur	6da42941a8	NEW Add attached document on bank account visible in automatic ECM.	2019-04-21 19:54:30 +02:00
Laurent Destailleur	74ba9f57f1	Fix phpcs	2019-04-19 18:48:00 +02:00
John BOTELLA	0855d84ccf	FIX error messages not displayed	2019-04-18 10:40:34 +02:00
atm-quentin	cb7f9c2b6f	NEW filter by thirdparty on report CA by prod/serv	2019-04-17 14:35:46 +02:00
Laurent Destailleur	e6ffaeefe5	CSS	2019-04-17 10:39:30 +02:00
Laurent Destailleur	212b058f46	Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop	2019-04-17 01:18:46 +02:00
Laurent Destailleur	8310e09786	Fix td balance	2019-04-17 01:18:02 +02:00
John BOTELLA	a60d4b3b52	Appli btn apply to links	2019-04-16 09:09:25 +02:00
John BOTELLA	7372e8c610	Appli function to links	2019-04-15 15:47:36 +02:00
Philippe GRAND	728381e6e6	FIX : bug #11018	2019-04-15 15:10:44 +02:00
ATM john	292d9c38a5	Appli function to links	2019-04-15 00:21:58 +02:00
Laurent Destailleur	76567b1d07	NEW Can filter on the date of period for social contributions	2019-04-12 12:51:48 +02:00
Laurent Destailleur	cf058e7d3b	NEW Ask date of invoice when using the Clone feature.	2019-04-12 12:12:08 +02:00
ATM john	bc4db54722	add more class	2019-04-11 21:29:01 +02:00
ATM john	3390ba0e77	Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_look_and_feel_title_button	2019-04-11 21:16:42 +02:00
Laurent Destailleur	8079a389f8	Merge pull request #10992 from altatof/faccard2 ... NEW : retrieve invoice infos from order when billing shipment	2019-04-11 16:34:42 +02:00
Laurent Destailleur	f2fd07d824	Merge pull request #10991 from altatof/faccard ... NEW constant KEEP_DISCOUNT_LINES_FROM_ORIGIN	2019-04-11 16:31:37 +02:00
Laurent Destailleur	4f87018c33	Update card.php	2019-04-11 16:31:13 +02:00
ATM john	29b31bd7ab	New title button first step	2019-04-11 00:38:44 +02:00
Christophe Battarel	46e398f3d3	NEW : retrieve invoice infos from order when billing shipment	2019-04-10 10:50:01 +02:00
Christophe Battarel	b04296984d	NEW constant KEEP_DISCOUNT_LINES_FROM_ORIGIN	2019-04-10 10:29:17 +02:00
Christophe Battarel	5f9f615e11	fix form_conditions_reglement parameters	2019-04-09 18:37:36 +02:00
Christophe Battarel	790c5f493a	fix select_conditions parameters	2019-04-09 18:32:00 +02:00
Christophe Battarel	01255602d8	fix select_conditions parameters	2019-04-09 18:30:58 +02:00
Christophe Battarel	5382ad207f	NEW : add payment terms to invoices list	2019-04-09 18:26:00 +02:00
Laurent Destailleur	d7f980fda0	NEW Add picto of deletion on mass action combo lists	2019-04-09 01:22:59 +02:00
Laurent Destailleur	7b01e76d2b	Fix doxygen	2019-04-08 16:04:15 +02:00
Laurent Destailleur	1274d71a10	Fix phpcs	2019-04-08 16:00:01 +02:00
Laurent Destailleur	2047ad62c5	Merge pull request #10979 from fpeyraud/develop ... Fix redirection on social tax deletion	2019-04-08 13:58:07 +02:00
Florent Peyraud	7672fd7cf0	Fix redirection on social tax deletion	2019-04-08 09:05:51 +02:00
Dan Rusu	4597e78a9d	Re synchronized the UI action button "Mark as credit available" with API ... At some point we will need to move this code into common location (maybe facture.class.php) and call as function from both places	2019-04-06 20:10:11 +03:00
Laurent Destailleur	bb9cd05ea8	Fix phpcs	2019-04-02 20:02:43 +02:00
Laurent Destailleur	42fda54edf	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/bank/card.php htdocs/fichinter/list.php htdocs/product/stock/replenish.php	2019-04-02 19:41:58 +02:00
Laurent Destailleur	c5348be337	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-04-02 19:35:42 +02:00
Laurent Destailleur	17a61b3232	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-04-02 19:34:49 +02:00
Laurent Destailleur	37b8796f3c	NEW Add line total on list of payments	2019-04-02 17:54:34 +02:00
Laurent Destailleur	8fe1be1a67	Removed deprecated use of string in dol_print_date(). Only date allowed.	2019-04-01 19:27:34 +02:00
Laurent Destailleur	143cbba09b	Update card.php	2019-03-31 18:49:38 +02:00
Laurent Destailleur	ec9fdc1321	Fix regression with class="right". Style of amount lost.	2019-03-31 11:25:29 +02:00
Alexandre SPANGARO	5588fe5b81	FIX: Don't show journal:getNomUrl without data ... ErrorBadValueForParamNotAString	2019-03-30 09:42:13 +01:00
Laurent Destailleur	5e23c4c03c	Fix self: not defined in a page	2019-03-29 16:23:55 +01:00
Laurent Destailleur	1b2826f476	Look and feel v10	2019-03-29 13:26:26 +01:00
Laurent Destailleur	11e4411400	TakePOS Can enter payment in several times and with different modes	2019-03-27 15:42:53 +01:00
Laurent Destailleur	a34f4c2806	Merge pull request #10909 from IonAgorria/fix-line-dates ... FIX: Disallow line start date after end date	2019-03-26 19:43:11 +01:00
Laurent Destailleur	f27f65e8bf	Responsive	2019-03-25 10:09:02 +01:00
Laurent Destailleur	1409d1a2c8	Fix phpcs	2019-03-24 19:52:48 +01:00
Laurent Destailleur	89b7f1a040	Fix phpcs	2019-03-24 19:52:18 +01:00
Laurent Destailleur	3578c7cb0a	Fix phpcs	2019-03-24 18:20:56 +01:00
Laurent Destailleur	364deb1476	Fix phpcs	2019-03-24 16:09:48 +01:00
Laurent Destailleur	28abf5663b	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/tva/clients.php	2019-03-24 15:06:16 +01:00
Laurent Destailleur	2034ac61ef	Fix phpcs	2019-03-24 15:05:02 +01:00
Ion	7bfa49b29c	FIX: Disallow line start date > end date	2019-03-24 14:30:00 +01:00
Laurent Destailleur	20f3af066c	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/tva/clients.php	2019-03-23 22:44:14 +01:00
Laurent Destailleur	79ed4bc80b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/core/actions_massactions.inc.php	2019-03-23 22:36:04 +01:00
Laurent Destailleur	28fede950f	Hidden option CHANGE_ORDER_CONCAT_DESCRIPTION were renamed into ... MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION	2019-03-22 13:00:48 +01:00
Laurent Destailleur	a7181750c6	Merge pull request #10879 from altatof/noconcatdesc ... NEW : add constant NO_CONCAT_DESCRIPTION	2019-03-22 12:56:46 +01:00
Laurent Destailleur	37cc5b7d35	Merge pull request #10901 from fmarcet/8.0 ... FIX: The minimum amount filter does not work in VAT report by customer	2019-03-22 12:27:30 +01:00
Ferran Marcet	f37c1b9287	FIX: The minimum amount filter does not work in the VAT report per customer	2019-03-22 09:28:50 +01:00
Laurent Destailleur	48a0c447b4	Fix test on draft status regression	2019-03-21 21:00:06 +01:00
Laurent Destailleur	ee4150665e	Fix phpcs	2019-03-21 20:15:19 +01:00
Laurent Destailleur	5693fbfe97	Merge pull request #10898 from grandoc/new_branch_21_03_2019 ... add some comments	2019-03-21 18:29:11 +01:00
Laurent Destailleur	47eb256b82	Fix phpcs	2019-03-21 18:22:17 +01:00
Laurent Destailleur	930720decd	WIP Start to replace use of property ->brouillon	2019-03-21 18:13:51 +01:00
Laurent Destailleur	90df30e412	NEW Add trigget FICHINTER_UNVALIDATE ... Standardize code of setDraft.	2019-03-21 17:37:56 +01:00
Philippe GRAND	cb59f52a55	add some comments	2019-03-21 15:01:09 +01:00
Philippe GRAND	86c3b1a5b0	add some comments	2019-03-21 14:59:21 +01:00
Laurent Destailleur	5d21547854	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/extrafields.class.php htdocs/product/price.php htdocs/user/perms.php	2019-03-21 12:20:24 +01:00
Frédéric FRANCE	89e8889c5c	phpcs fix v9	2019-03-19 16:33:34 +01:00
Laurent Destailleur	eab11ce743	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.form.class.php	2019-03-19 13:14:44 +01:00
Laurent Destailleur	dbe15d3685	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-03-19 13:10:17 +01:00
Laurent Destailleur	b11403103b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-03-19 13:09:48 +01:00
Laurent Destailleur	8664594fc8	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-03-19 13:09:39 +01:00
Laurent Destailleur	eaaea2c2f9	Fix set of due date when invoice created from API	2019-03-19 12:08:55 +01:00
Laurent Destailleur	bca10084c5	Merge pull request #10882 from alexandreaj/patch-1 ... Update api_invoices.class.php	2019-03-19 12:07:16 +01:00
Laurent Destailleur	70cb042e58	Update api_invoices.class.php	2019-03-19 12:06:57 +01:00
Laurent Destailleur	b10690ce88	Merge pull request #10874 from grandoc/translation ... translation	2019-03-19 11:14:40 +01:00
Laurent Destailleur	6bead00260	Better text	2019-03-19 10:27:36 +01:00
Laurent Destailleur	3f62098b81	Add hours in date	2019-03-19 10:14:13 +01:00
alexandreaj	9bb1ede65a	Update api_invoices.class.php ... Adding possibility to set due date (date_lim_reglement field in mysql) via the API.	2019-03-18 21:11:13 +01:00
Laurent Destailleur	41c737a213	Fix, Oops, test was inverted	2019-03-18 20:16:19 +01:00
Laurent Destailleur	aa013ff753	Fix do we really must copy notes when creating an object from another ... source object? Add a hack with hidden option to be able to change this.	2019-03-18 20:09:09 +01:00
Christophe Battarel	8b3fd2eacf	NEW : add constant NO_CONCAT_DESCRIPTION	2019-03-18 16:10:17 +01:00
Philippe GRAND	c13a1dbc63	translation	2019-03-18 13:45:24 +01:00
Philippe GRAND	0f03b16313	translation	2019-03-18 12:46:32 +01:00
Laurent Destailleur	89087c6847	Merge pull request #10800 from atm-quentin/FIX_wrong_vat_deposit_invoice ... Wrong vat if deposit from propal with multiple vat	2019-03-18 11:14:11 +01:00
Regis Houssin	57091f08b0	FIX missing entity filter and wrong var name	2019-03-18 10:53:43 +01:00
Laurent Destailleur	f3cf3482fa	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/paiement/class/paiement.class.php htdocs/projet/element.php	2019-03-18 10:23:14 +01:00
Laurent Destailleur	34034787af	FIX problem with sign of various payment in project preview	2019-03-18 10:16:08 +01:00
Laurent Destailleur	1abfd1f58e	Add page to setup module debugbar ... Fix CSS	2019-03-17 00:32:39 +01:00
Laurent Destailleur	7cdfff7263	Fix syntax error	2019-03-15 20:42:49 +01:00
Laurent Destailleur	875b5b6a8d	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/expensereport/card.php htdocs/projet/card.php htdocs/public/opensurvey/studs.php	2019-03-15 19:20:22 +01:00
Laurent Destailleur	39e24d30aa	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-03-15 19:18:30 +01:00
Laurent Destailleur	681d626284	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-03-15 19:17:31 +01:00
Laurent Destailleur	b33c366b02	Update card.php	2019-03-15 19:16:49 +01:00
Laurent Destailleur	c0b6699b25	All methods set_draft() were renamed into setDraft()	2019-03-15 19:01:40 +01:00
Laurent Destailleur	a2d6723ff3	WIP Link files to expense report lines	2019-03-15 15:07:52 +01:00
Laurent Destailleur	bcf0dd0168	Merge branch 'develop' into patch-5	2019-03-14 16:47:08 +01:00
Laurent Destailleur	cdf6e4b65a	Fix some PSR rules	2019-03-14 16:43:27 +01:00
Frédéric FRANCE	321a919fb1	Update result.php	2019-03-14 16:42:35 +01:00
florian HENRY	9bcb91a122	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop	2019-03-14 13:02:09 +01:00
gauthier	a524bbc5c6	FIX : when we create deposit with multi tva, we mustn't add line if amount = 0 (example when we have a 100% reduc on one of origin invoice line)	2019-03-13 15:59:41 +01:00
Laurent Destailleur	eeafc3c630	Standardize translation of amount	2019-03-13 14:10:36 +01:00
Laurent Destailleur	98ca9bf17a	Reduce quantity of string to translates	2019-03-12 19:44:59 +01:00
florian HENRY	9968fae9dc	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop	2019-03-12 17:25:00 +01:00
Joan Louis	17647de4cc	Fix extrafields calls from cards for Dolibarr 8 See #10803	2019-03-12 11:24:54 +01:00
Joan Louis	f326c75be7	Update call to extrafields from cards	2019-03-11 21:34:16 +01:00
florian HENRY	53a76e91b4	fix missing test on method result	2019-03-11 21:25:51 +01:00
Joan Louis	ee5753819e	Update call to extrafields from cards	2019-03-11 14:22:04 +01:00
atm-quentin	ab781c32c7	Wrong vat if deposit from propal with multiple vat	2019-03-11 11:28:25 +01:00
Laurent Destailleur	f3ca69522e	Fix phpcs	2019-03-11 01:41:09 +01:00
Alexandre SPANGARO	ad485b55b6	NEW: Add category to bank transaction in various payment	2019-03-10 20:01:39 +01:00
Laurent Destailleur	9a5497b940	Merge pull request #10776 from frederic34/patch-3 ... do not trim int	2019-03-08 19:38:44 +01:00
Frédéric FRANCE	3dd4f0bfff	do not trim int	2019-03-07 22:17:48 +01:00
Frédéric FRANCE	d96cc53f97	replace html by html5 in fourn	2019-03-07 20:46:38 +01:00
Laurent Destailleur	1fb86e12e5	Merge manually some enhancement from #10507	2019-03-07 13:02:51 +01:00
Laurent Destailleur	a426c8e9bf	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/system/filecheck.php htdocs/compta/facture/class/facture.class.php htdocs/filefunc.inc.php htdocs/install/upgrade2.php htdocs/product/class/product.class.php	2019-03-07 11:16:24 +01:00
Laurent Destailleur	b15e00cae7	FIX Autodetect buy price for invoices autogenerated with templates.	2019-03-06 21:39:09 +01:00
Frédéric FRANCE	f283782445	change visibility	2019-03-04 19:57:46 +01:00
Laurent Destailleur	63d14b16c9	FIX The notes was also copied on invoice	2019-03-04 14:56:39 +01:00
Laurent Destailleur	db13e54724	FIX The notes was also copied on invoice	2019-03-04 14:54:59 +01:00
Laurent Destailleur	1686b7b1db	FIX label of bank account	2019-03-04 14:42:00 +01:00
Laurent Destailleur	fe5cb57df8	FIX label of bank account	2019-03-04 14:41:20 +01:00
Laurent Destailleur	4cb5c9ef35	Var not initialized	2019-03-02 19:26:01 +01:00
Laurent Destailleur	a5711a51ab	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/core/lib/json.lib.php test/phpunit/JsonLibTest.php	2019-03-02 18:30:17 +01:00
Laurent Destailleur	4f9981063f	Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing	2019-03-02 18:26:50 +01:00
Laurent Destailleur	50f6bbefe7	Merge pull request #10720 from frederic34/patch-5 ... Update facture-rec.class.php	2019-03-02 18:23:26 +01:00
Laurent Destailleur	56d921ea52	CSS	2019-03-02 12:57:07 +01:00
Frédéric FRANCE	728a3fcbba	Update facture-rec.class.php	2019-03-02 08:43:09 +01:00
Frédéric FRANCE	4fcde0eaa3	Update facture-rec.class.php	2019-03-02 01:37:49 +01:00
Frédéric FRANCE	62501b11e8	add visibility	2019-03-02 00:14:22 +01:00
Frédéric FRANCE	014f69850e	add visibility	2019-03-01 23:08:57 +01:00
Frédéric FRANCE	be8db31388	Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing	2019-03-01 19:24:27 +01:00
Frédéric FRANCE	bd2e541fd6	add visibility	2019-03-01 18:28:51 +01:00
Laurent Destailleur	2e128a786b	NEW Can change the customer account of an instance	2019-03-01 15:38:15 +01:00
Frédéric FRANCE	796ea6f4ea	add visibility	2019-02-28 23:19:58 +01:00
Laurent Destailleur	b3fb0eaf5b	Merge branch 'develop' into Squiz.Scope.MethodScope.Missing	2019-02-27 15:48:31 +01:00
Laurent Destailleur	2448d1deaa	fk_projet -> fk_project	2019-02-27 15:32:18 +01:00
Laurent Destailleur	3bffa69f1d	Remove deprecated code	2019-02-27 15:23:56 +01:00
Laurent Destailleur	da826c4bc7	Fix bad var name	2019-02-27 01:22:26 +01:00
Frédéric FRANCE	81f2f99db5	Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing	2019-02-26 21:16:01 +01:00
Laurent Destailleur	3ec2338c2d	Look and feel v10	2019-02-26 19:37:32 +01:00
Frédéric FRANCE	346d1f410c	wip	2019-02-25 23:15:48 +01:00
Laurent Destailleur	8a9339a059	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/compta/facture/class/api_invoices.class.php	2019-02-25 15:16:23 +01:00
Laurent Destailleur	dde18e803d	Fix transaction	2019-02-25 15:09:56 +01:00
Laurent Destailleur	3fa2680859	Merge pull request #10669 from frederic34/html5fix ... replace by html5 in ticket supplier_proposal, stripe, societe	2019-02-24 20:36:24 +01:00
Laurent Destailleur	3f078203b9	Fix phpcs	2019-02-24 20:29:01 +01:00
Frédéric FRANCE	4f341ea022	replace html code by html5	2019-02-23 22:56:38 +01:00
Frédéric FRANCE	4b0b8e1c1f	Update api_invoices.class.php	2019-02-23 16:44:36 +01:00
Frédéric FRANCE	0e093ffb24	Update api_invoices.class.php	2019-02-23 16:41:40 +01:00
Frédéric FRANCE	f1e4c80771	Update api_invoices.class.php	2019-02-23 16:39:15 +01:00
Laurent Destailleur	f83f746123	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/compta/facture/class/facture.class.php	2019-02-23 16:03:40 +01:00
Laurent Destailleur	cdf85b0d00	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-02-23 16:02:35 +01:00
ptibogxiv	d7ffcca59b	FIX fetch module / pos source	2019-02-23 16:00:07 +01:00
Laurent Destailleur	0298582fc3	Merge pull request #10640 from ptibogxiv/patch-122 ... FIX fetch module / pos source	2019-02-23 15:59:22 +01:00
Laurent Destailleur	9ba6e3f8f5	FIX #10638	2019-02-23 15:57:57 +01:00
Laurent Destailleur	2413c41622	Merge pull request #10639 from ptibogxiv/patch-121 ... NEW POS support in order (ex: online cart)	2019-02-23 15:19:10 +01:00
Laurent Destailleur	b3c3e8f09e	Merge pull request #10547 from Rusu-Marian-Dan/develop ... New API markAsCreditAvailable	2019-02-23 14:39:13 +01:00
Laurent Destailleur	ca45651265	Update api_invoices.class.php	2019-02-23 14:38:13 +01:00
Laurent Destailleur	eb733728c3	Update api_invoices.class.php	2019-02-23 14:37:09 +01:00
Laurent Destailleur	5bf3a1f175	Update api_invoices.class.php	2019-02-23 14:36:51 +01:00
Laurent Destailleur	3d0af97e79	Update api_invoices.class.php	2019-02-23 14:24:37 +01:00
Cristian Torres	8ca6935f8b	[FIX] Variable $i is already declared ... It was preventing displaying of the other accounts	2019-02-23 14:08:11 +01:00
Laurent Destailleur	59218de7de	Merge pull request #10637 from tony13tv/patch-1 ... [FIX] Variable $i is already declared	2019-02-23 14:07:46 +01:00
ptibogxiv	98affe0921	Update facture.class.php	2019-02-20 14:25:25 +01:00
ptibogxiv	152585c1b8	Update facture.class.php	2019-02-20 13:20:46 +01:00
ptibogxiv	ef5372f476	Update facture.class.php	2019-02-20 13:04:22 +01:00
ptibogxiv	6416f24d5f	FIX fetch module / pos source	2019-02-20 12:35:13 +01:00
ptibogxiv	c0de2b5b07	Update facture.class.php	2019-02-20 12:22:02 +01:00
Laurent Destailleur	4296f959ca	Invert option MAIN_HIDE_VERSION into ! MAIN_SHOW_VERSION ... Reorganize levels of menu accountancy	2019-02-20 04:55:35 +01:00
Cristian Torres	7128270a95	[FIX] Variable $i is already declared ... It was preventing displaying of the other accounts	2019-02-19 11:37:46 -06:00
Laurent Destailleur	86c9dbc218	Merge branch 'develop' into new_branch_14_02_2019	2019-02-19 13:26:35 +01:00
Laurent Destailleur	e4698fb6a5	Merge	2019-02-18 19:14:25 +01:00
Laurent Destailleur	ad7b8371da	FIX Mark credit note as available for credit note in other currency ... Conflicts: htdocs/compta/paiement.php htdocs/core/class/discount.class.php	2019-02-18 18:30:15 +01:00
Laurent Destailleur	07d1559802	FIX Mark credit note as available for credit note in other currency	2019-02-18 18:27:06 +01:00
Laurent Destailleur	b2ec340a48	FIX Show button POS Ticket only if invoice was generated by POS	2019-02-18 17:04:53 +01:00
Dan Rusu	75e52628ec	Merge remote-tracking branch 'upstream/develop' into develop	2019-02-16 09:07:44 +02:00
Philippe Grand	40345ea0f5	Update paiement_charge.php ... fixed...	2019-02-15 17:38:35 +01:00
Laurent Destailleur	3f01b590fe	Merge pull request #10609 from frederic34/patch-17 ... Update api_invoices.class.php	2019-02-15 15:11:33 +01:00
Philippe Grand	7cb4455729	Update paiement.php	2019-02-15 10:42:06 +01:00
Philippe Grand	55dc5677b2	Update clients.php	2019-02-15 10:40:30 +01:00
Philippe Grand	18dbad0d42	Update list.php ... We gone make it :)	2019-02-15 10:38:03 +01:00
Philippe Grand	348b6c9f69	Update list.php	2019-02-15 09:45:08 +01:00
Philippe Grand	88d84332e9	Update clients.php	2019-02-15 09:42:39 +01:00
Philippe Grand	a8fdcff934	Update paiement.php	2019-02-15 09:38:57 +01:00
Frédéric FRANCE	b892fc7182	Update api_invoices.class.php	2019-02-14 18:22:35 +01:00
Frédéric FRANCE	dc054e56ec	Update compta-files.php	2019-02-14 18:10:10 +01:00
Philippe GRAND	ec370e247a	update with html5 compliant code	2019-02-14 16:59:24 +01:00
Philippe GRAND	43486828db	update with html5 compliant code	2019-02-14 16:56:49 +01:00
Philippe GRAND	a6cc8278c8	update with html5 compliant code	2019-02-14 16:54:53 +01:00
Philippe GRAND	5b2c80b62d	update with html5 compliant code	2019-02-14 16:51:09 +01:00
Philippe GRAND	91fca7a1af	update with html5 compliant code	2019-02-14 16:48:10 +01:00
Philippe GRAND	2507ff9684	update with html5 compliant code	2019-02-14 16:45:49 +01:00
Philippe GRAND	ed1a59d00b	update with html5 compliant code	2019-02-14 16:43:40 +01:00
Philippe GRAND	1f2dd3bc29	update with html5 compliant code	2019-02-14 16:38:03 +01:00
Philippe GRAND	69f350eb0e	update with html5 compliant code	2019-02-14 16:33:38 +01:00
ptibogxiv	7f3f166a81	NEW link/delete contact in invoice object	2019-02-14 00:44:40 +01:00
Laurent Destailleur	b9467c10bf	Merge pull request #10561 from eoxia-jimmy/develop ... NEW: API Proposal, Orders, Invoices: Add contact details	2019-02-13 16:39:57 +01:00
Laurent Destailleur	e18ff7d087	Merge pull request #10568 from frederic34/patch-20 ... Update facture-rec.class.php	2019-02-13 16:36:54 +01:00
florian HENRY	dd9896516b	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... dev_importproduct_measuringunit Conflicts: htdocs/margin/agentMargins.php htdocs/product/stock/movement_card.php htdocs/projet/tasks/time.php htdocs/resource/class/html.formresource.class.php	2019-02-13 12:52:07 +01:00
Laurent Destailleur	04e3f23476	Fix phpcs	2019-02-13 11:52:45 +01:00
Laurent Destailleur	5c27ec5d25	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/menus/edit.php htdocs/compta/compta-files.php	2019-02-13 11:21:20 +01:00
florian HENRY	de87321c15	fix travcis	2019-02-13 10:28:08 +01:00
florian HENRY	e2d13c0e1f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... dev_importproduct_measuringunit Conflicts: htdocs/contact/consumption.php htdocs/webservices/server_productorservice.php	2019-02-13 09:23:52 +01:00
florian HENRY	5c059c897d	fix travis (mosty for dev no conerne by my changes)	2019-02-13 09:21:14 +01:00
Frédéric FRANCE	56bbe41917	Update facture-rec.class.php	2019-02-12 23:54:38 +01:00
Laurent Destailleur	d42bf54436	Fix export zip	2019-02-12 23:12:33 +01:00
Laurent Destailleur	036dc52170	Fix test	2019-02-12 19:55:54 +01:00
Laurent Destailleur	5a2161ad09	Debug export of zip	2019-02-12 19:47:46 +01:00
Laurent Destailleur	666d03f596	Fix multicompany for page to export zip of invoices	2019-02-12 18:15:30 +01:00
Laurent Destailleur	68e6f32320	css	2019-02-12 17:56:03 +01:00
Jimmy L	a172ea00a4	Rest API: Proposal, Orders, Invoices: Add contact details	2019-02-12 17:54:59 +01:00
Laurent Destailleur	3d3aca804f	Merge pull request #10554 from grandoc/new_branch_12_02_2019 ... update with html5 compliant code	2019-02-12 16:57:11 +01:00
Alexandre SPANGARO	7e60c3bf84	FIX: In various payment, subledger & accout may be alphanumeric	2019-02-12 16:27:25 +01:00
Philippe GRAND	f7a28328ed	update with html5 compliant code	2019-02-12 15:40:16 +01:00
Philippe GRAND	60e503c7d1	update with html5 compliant code	2019-02-12 15:02:54 +01:00
Philippe GRAND	5007ef82c8	update with html5 compliant code	2019-02-12 14:56:38 +01:00
Philippe GRAND	fd6eaf8c3d	update with html5 compliant code	2019-02-12 14:53:35 +01:00
Philippe GRAND	66e8380a4a	update with html5 compliant code	2019-02-12 14:48:07 +01:00
Philippe GRAND	e10d1eb365	update with html5 compliant code	2019-02-12 14:44:25 +01:00
Philippe GRAND	8a62c9bc5f	update with html5 compliant code	2019-02-12 14:40:30 +01:00
Laurent Destailleur	46941d4c20	Merge pull request #10539 from frederic34/patch-17 ... Update paiement.php	2019-02-12 13:43:09 +01:00
Laurent Destailleur	3e1b75e916	Merge pull request #10541 from grandoc/new_branch_10_02_2019 ... update with html5 compliant code	2019-02-12 13:35:27 +01:00
Laurent Destailleur	e054b080a5	Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing	2019-02-12 13:33:39 +01:00
Laurent Destailleur	6f6a767255	Merge pull request #10520 from aspangaro/develop ... NEW: Add subledger in various payment	2019-02-12 13:20:58 +01:00
Dan Rusu	57e2971a22	fix code indent	2019-02-11 19:58:01 +02:00
Laurent Destailleur	5c01ec158d	Fix regression	2019-02-11 15:40:33 +01:00
Dan Rusu	9ce4b91f5d	NEW | make credit note from invoice ... inspired from the action of the button "Make credit note" from UI. - load invoice data and lines - check invoice type - calculate totals and create new credit notes - create DiscountAbsolute & commit changes	2019-02-11 09:31:43 +02:00
Dan Rusu	0698ddbd77	Revert "add API method to create credit note from invoice" ... This reverts commit 288a876491.	2019-02-11 09:24:16 +02:00
Dan Rusu	288a876491	add API method to create credit note from invoice	2019-02-11 09:14:06 +02:00
Philippe Grand	d589ba4847	Update clientfourn.php ... fixed...	2019-02-10 19:13:11 +01:00
Philippe GRAND	0911631b47	update with html5 compliant code	2019-02-10 16:31:34 +01:00
Philippe GRAND	0d5726b70a	update with html5 compliant code	2019-02-10 16:08:03 +01:00
Philippe GRAND	5d6ebad557	update with html5 compliant code	2019-02-10 16:05:06 +01:00
Philippe GRAND	9670228f06	update with html5 compliant code	2019-02-10 16:00:59 +01:00
Philippe GRAND	d42ef14a92	update with html5 compliant code	2019-02-10 15:59:19 +01:00
Philippe GRAND	20c0af1f57	update with html5 compliant code	2019-02-10 11:04:09 +01:00
Philippe GRAND	1b25d284a2	update with html5 compliant code	2019-02-10 11:01:23 +01:00
Philippe GRAND	89351e6027	update with html5 compliant code	2019-02-10 10:56:34 +01:00
Philippe GRAND	e7f2b92eca	update with html5 compliant code	2019-02-10 10:49:42 +01:00
Frédéric FRANCE	1e43f8e54a	PEAR FunctionCallSignature	2019-02-10 10:45:49 +01:00
Philippe GRAND	2624865632	update with html5 compliant code	2019-02-10 10:38:50 +01:00
Philippe GRAND	83b95ae6cc	update with html5 compliant code	2019-02-10 10:25:20 +01:00
Philippe GRAND	19885cb465	update with html5 compliant code	2019-02-10 10:23:37 +01:00
Philippe GRAND	673e09d7c2	update with html5 compliant code	2019-02-10 10:21:54 +01:00
Philippe GRAND	508d6345a1	update with html5 compliant code	2019-02-10 10:16:58 +01:00
Philippe GRAND	c071e488cf	update with html5 compliant code	2019-02-10 10:10:41 +01:00
Frédéric FRANCE	2020e199b2	Update paiement.php	2019-02-09 16:35:10 +01:00
Frédéric FRANCE	580e5c42d2	GenericFunctionsFunctionCallArgumentSpacing	2019-02-09 12:00:49 +01:00
Laurent Destailleur	0e42e8824b	Merge branch 'develop' into new_branch_04_02_2019	2019-02-08 09:42:18 +01:00
Laurent Destailleur	8abebb091c	Var no more used	2019-02-08 09:33:01 +01:00
Laurent Destailleur	24955088de	Merge pull request #10501 from hregis/8.0_mc ... FIX [URGENT] broken feature, "$usercancreate" is for Dolibarr 9	2019-02-08 09:31:26 +01:00
Alexandre SPANGARO	2ba8ae00e4	Merge remote-tracking branch 'upstream/develop' into develop	2019-02-06 21:56:01 +01:00
Alexandre SPANGARO	a28c926f03	Fix	2019-02-06 21:43:16 +01:00
gauthier	29e4fce450	FIX : can't add lines on invoices	2019-02-06 12:35:23 +01:00
Regis Houssin	8860eab6b1	FIX wrong merged conflict	2019-02-05 07:40:50 +01:00
Regis Houssin	4a19cba257	FIX [URGENT] broken feature, "$usercancreate" is for Dolibarr 9	2019-02-05 06:34:05 +01:00
Philippe GRAND	6b9b17f93e	update with html5 compliant code	2019-02-04 13:57:38 +01:00
Philippe GRAND	a14332b2b0	update with html5 compliant code	2019-02-04 13:51:39 +01:00
Philippe GRAND	28a2135409	update with html5 compliant code	2019-02-04 13:45:50 +01:00
Philippe GRAND	386a4102b7	update with html5 compliant code	2019-02-04 13:44:02 +01:00
Philippe GRAND	b7605e233e	update with html5 compliant code	2019-02-04 13:40:00 +01:00
Laurent Destailleur	3babc11312	Fix phpcs	2019-02-04 02:06:32 +01:00
Frédéric FRANCE	e1e14ae6e6	wip	2019-02-03 22:58:56 +01:00
Frédéric FRANCE	970392adb8	Merge remote-tracking branch 'upstream/develop' into psr2squizwhite	2019-02-03 22:41:57 +01:00
Laurent Destailleur	57f81217ee	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/localtax/index.php htdocs/compta/tva/index.php	2019-02-03 21:14:44 +01:00
Laurent Destailleur	efe5cd3dd8	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-02-03 21:13:06 +01:00
Laurent Destailleur	cdfeeafab9	FIX #10381	2019-02-03 21:12:05 +01:00
Laurent Destailleur	af9e2d07d2	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/compta/paiement.php htdocs/fourn/facture/paiement.php	2019-02-03 20:38:47 +01:00
Laurent Destailleur	4b77b3ff23	NEW Support tag {ccc} on payment ref	2019-02-03 20:36:20 +01:00
Laurent Destailleur	a6dde3d6bd	Merge branch 'develop' into nospaceaftercomma	2019-02-03 19:27:16 +01:00
Frédéric FRANCE	273d68381c	psr2 end file new line none found	2019-02-03 15:21:21 +01:00
Frédéric FRANCE	80a12fcd1c	psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent	2019-02-03 14:29:45 +01:00
Alexandre SPANGARO	13cf3b1d7f	Add subledger in various payment	2019-02-01 15:50:12 +01:00
Frédéric FRANCE	b766204690	wip	2019-01-30 22:53:47 +01:00
Frédéric FRANCE	f83ee43a19	Merge branch 'develop' into nospaceaftercomma	2019-01-30 22:15:22 +01:00
Laurent Destailleur	a23fd6f090	Fix phpcs	2019-01-30 20:55:55 +01:00
Laurent Destailleur	01f1f6162f	Fix phpcs	2019-01-30 20:06:21 +01:00
Laurent Destailleur	15bd99acf4	Fix phpcs	2019-01-30 20:06:05 +01:00
Laurent Destailleur	2882f45bca	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-30 18:55:01 +01:00
Laurent Destailleur	f67937c59d	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-01-30 18:54:29 +01:00
Laurent Destailleur	ae1c4e065b	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-01-30 18:53:56 +01:00
Laurent Destailleur	e18bd6f986	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
Laurent Destailleur	9fdba921b4	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/compta/facture/card.php htdocs/core/lib/functions.lib.php	2019-01-30 16:48:33 +01:00
Laurent Destailleur	81ae4c52c5	Merge pull request #10446 from mapiolca/8.0 ... Fix #10317 et #10318	2019-01-30 16:43:14 +01:00
Laurent Destailleur	e72d6c50e6	Merge pull request #10428 from frederic34/toomanylines ... PSR2.Files.EndFileNewline.TooMany	2019-01-30 16:17:09 +01:00
Laurent Destailleur	648eea3a70	Merge branch 'develop' into nospaceaftercomma	2019-01-30 16:00:11 +01:00
Pierre Ardoin	30548d977f	Prise en charge des Travaux supplémentaires ... Corrige la filtration pour permettre l'ajout de ligne lors de la présence de travaux supplémentaires en cours de chantier.	2019-01-29 11:19:11 +01:00
Alexandre SPANGARO	cc88c4f8ff	Move my email to the new one	2019-01-28 21:39:22 +01:00
Frédéric FRANCE	77747ac2a3	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-28 16:35:12 +01:00
Laurent Destailleur	0827929ede	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/card.php	2019-01-28 16:29:34 +01:00
John BOTELLA	6f12cdf236	Fix travis	2019-01-28 11:58:16 +01:00
John BOTELLA	5dbc9ddae0	fix travis	2019-01-28 11:56:20 +01:00
Laurent Destailleur	f7bcd1ef6d	Fix trans	2019-01-28 01:35:12 +01:00
Frédéric FRANCE	b10558bacd	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-27 23:23:38 +01:00
Laurent Destailleur	ecc30b8ffe	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/card.php	2019-01-27 18:27:58 +01:00
Laurent Destailleur	f30a3d59ba	Merge branch 'develop' into toomanylines	2019-01-27 17:59:13 +01:00
Laurent Destailleur	4f9f0fd7b5	Merge branch 'develop' into elseif	2019-01-27 17:54:06 +01:00
Frédéric FRANCE	f0cdf300d1	Squiz.Functions.FunctionDeclarationArgumentSpacing	2019-01-27 15:20:16 +01:00
Frédéric FRANCE	496fa9b0fb	PSR2.Files.EndFileNewline.TooMany	2019-01-27 14:10:35 +01:00
Frédéric FRANCE	7ee086b402	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
Frédéric FRANCE	6e91b3cefc	PSR2 usage of else if is discouraged	2019-01-27 10:49:34 +01:00
Laurent Destailleur	ba87284a90	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-01-26 14:30:44 +01:00
Laurent Destailleur	e46fb303d0	Merge pull request #10386 from atm-florian/dev_newhiglightinvoice_onpayment ... NEW show in blod invoice amount where we came from when making payment	2019-01-26 14:29:20 +01:00
Laurent Destailleur	adb7ec7015	Merge pull request #10399 from grandoc/new_branch_23_01_2019 ... update with html5 compliant code	2019-01-26 14:02:26 +01:00
Laurent Destailleur	6b4b03e6aa	Merge pull request #10405 from grandoc/new_branch_24_01_2019 ... update with html5 compliant code	2019-01-26 13:52:10 +01:00
Laurent Destailleur	63e04823b2	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-25 11:57:01 +01:00
Laurent Destailleur	63c66095e6	Work on file export	2019-01-25 11:56:50 +01:00
Laurent Destailleur	a5daa25707	Move common code to get sell price into a method	2019-01-24 19:45:17 +01:00
Philippe GRAND	c1b0d3667a	update with html5 compliant code	2019-01-24 16:47:19 +01:00
Philippe GRAND	0b353dc560	update with html5 compliant code	2019-01-24 16:43:28 +01:00
Philippe GRAND	7c086ba8ed	update with html5 compliant code	2019-01-24 10:02:06 +01:00
Philippe GRAND	1599f165ee	update with html5 compliant code	2019-01-24 09:57:39 +01:00
Philippe GRAND	7ff1555e58	update with html5 compliant code	2019-01-23 17:39:40 +01:00
John BOTELLA	624d17c96a	Fix missing no trigger arg	2019-01-23 17:32:49 +01:00
John BOTELLA	1c51716997	Fix missing trigger	2019-01-23 17:02:20 +01:00
gauthier	84e1f92acd	FIX : when we add a payment on an invoice which already has payments with credit note or deposit amount, and then we get an excess received, discount amount must be $total_paiements + $total_creditnote_and_deposit - $object->total_ttc;	2019-01-23 15:16:51 +01:00
Laurent Destailleur	fbf5a1c056	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-21 20:48:19 +01:00
florian HENRY	a5cbef7aec	new show in blod invoice amount where we came from for payment	2019-01-21 11:51:54 +01:00
Frédéric FRANCE	4ab19c25c8	add missing global $conf in bonprelevement class	2019-01-21 08:23:31 +01:00
Laurent Destailleur	c26f264cac	Merge pull request #10369 from mwelters/mwelters/addays ... Add configurable days to SEPA Withdrawal Execution Date	2019-01-20 19:47:57 +01:00
markus	a45ea9239d	Rename consts and cleanup	2019-01-19 14:24:20 +01:00
Laurent Destailleur	300889f53a	# WARNING: head commit changed in the meantime ... Fix	2019-01-19 13:22:38 +01:00
Laurent Destailleur	2bbaae88d6	Fix standardize 'createfromclone' param when cloning	2019-01-19 12:46:38 +01:00
markus	de9b8f427d	Add configurable days to SEPA Withdrawal Execution Date	2019-01-18 16:16:55 +01:00
Philippe GRAND	0290b74495	update with html5 compliant code	2019-01-18 10:18:18 +01:00
Philippe GRAND	44708ce7d5	update with html5 compliant code	2019-01-18 10:16:51 +01:00
Philippe GRAND	539660a45d	update with html5 compliant code	2019-01-18 10:13:05 +01:00
Philippe GRAND	8096844062	update with html5 compliant code	2019-01-18 10:10:39 +01:00
Philippe GRAND	68c6ccae22	update with html5 compliant code	2019-01-18 10:06:45 +01:00
Laurent Destailleur	58bda12e22	css	2019-01-17 19:31:01 +01:00
Laurent Destailleur	5130019003	css	2019-01-17 19:27:26 +01:00
Laurent Destailleur	2e55bdf087	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-17 19:11:18 +01:00
Laurent Destailleur	16bb85b7fa	Merge pull request #10348 from a-schild/9.0 ... Fix for issue #10333 branch 9.0	2019-01-17 18:58:49 +01:00
Laurent Destailleur	67efae20f4	Fix css	2019-01-17 17:23:54 +01:00
Laurent Destailleur	ab5aaa6b43	Start debug compta-files	2019-01-17 00:32:43 +01:00
Laurent Destailleur	889ce7fc5d	Start debug compta-files	2019-01-17 00:09:05 +01:00
Laurent Destailleur	8d4d1dbf99	Fix phpcs	2019-01-16 18:51:51 +01:00
Laurent Destailleur	3a8afafabd	Merge pull request #10027 from atm-quentin/NEW_manage_multicompany_for_invoice ... New manage multicompany for invoice	2019-01-16 18:51:01 +01:00
Laurent Destailleur	f8973c9a22	Fix translation Late <> Alert	2019-01-16 17:44:39 +01:00
Laurent Destailleur	e7943ae844	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-16 16:48:52 +01:00
Laurent Destailleur	d3828130ab	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/adherents/class/adherent.class.php	2019-01-16 16:48:21 +01:00
a-schild	7e3bfd332e	Fix for issue #10333 ... paymentterm.class.php invalid SQL in fetch	2019-01-16 13:07:00 +01:00
a-schild	7df86cb630	Fix for issue #10333 ... paymentterm.class.php invalid SQL in fetch	2019-01-16 13:06:12 +01:00
a-schild	2f5db98a5c	Fix for issue #10333 ... paymentterm.class.php invalid SQL in fetch	2019-01-16 13:05:22 +01:00
atm-quentin	013c078c8b	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice	2019-01-16 10:52:46 +01:00
atm-quentin	0d384eea00	FIX credit note can have negative value	2019-01-16 09:33:24 +01:00
André Schild	1c0e15192d	Fix for issue #10333 ... paymentterm.class.php invalid SQL in fetch	2019-01-15 20:43:16 +01:00
delcroix Patrick	9d2d4bc91d	Fix compatibiliy issue with pgSQL	2019-01-15 17:06:48 +01:00
Laurent Destailleur	19be47dbf7	Code comment	2019-01-12 01:22:08 +01:00
Laurent Destailleur	22d4afbb62	Missing trans	2019-01-10 01:54:06 +01:00
Laurent Destailleur	48e407740d	Fix tooltip	2019-01-10 01:49:49 +01:00
Laurent Destailleur	fbd490da15	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-09 13:29:47 +01:00
Laurent Destailleur	d1e062cafa	FIX When changing date of payment, change also record in bank if not ... conciliated yet.	2019-01-09 13:28:12 +01:00
Laurent Destailleur	d9999d61f6	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-09 12:27:25 +01:00
Laurent Destailleur	890abd28d5	Fix look and feel v9	2019-01-09 12:26:49 +01:00
Laurent Destailleur	d929d93376	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-08 14:19:35 +01:00
diversity-co-uk	2dc87509ff	Fix Invoice PUT, remove extra parameter ... The first parameter is expected to be the user. The $id of the invoice is already contained in $this See facture.class.php 1610: function update(User $user, $notrigger=0)	2019-01-08 14:17:33 +01:00
Laurent Destailleur	126e02798a	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/langs/en_US/cashdesk.lang htdocs/langs/fr_FR/cashdesk.lang	2019-01-07 19:49:15 +01:00
Laurent Destailleur	8b1455f29e	FIX Cash fence	2019-01-07 19:35:20 +01:00
Laurent Destailleur	527ef8bdc8	Add nb of invoice to help cash fence	2019-01-07 19:02:38 +01:00
mapiolca	bab82a77b5	Update card.php ... Permettre d'ajouter des lignes complémentaires en cas de travaux supplémentaires lors des situations de travaux.	2019-01-05 22:42:51 +01:00
ldestailleur	451b3e30cc	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/company.lib.php htdocs/core/lib/functions.lib.php htdocs/langs/en_US/cashdesk.lang	2019-01-04 19:36:20 +01:00
ldestailleur	1b19f5153b	Fix cash fence feature	2019-01-03 14:18:02 +01:00
ldestailleur	7cb3b8dfec	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-02 19:42:26 +01:00
ldestailleur	bc00fb177a	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-02 19:42:15 +01:00
Laurent Destailleur	422e18ee8e	Merge pull request #10268 from hregis/develop_upgrade ... FIX remove old unused and deprecated function "getStaticMember"	2019-01-02 19:37:49 +01:00
Alexandre SPANGARO	c4dbf41530	Look & feel	2018-12-30 21:21:40 +01:00
Alexandre SPANGARO	a2075b9d2c	V9 look & Feel, etc	2018-12-30 20:32:44 +01:00
ldestailleur	3af418349a	FIX Can't empty the payment mode	2018-12-29 07:54:30 +01:00
ldestailleur	0353bd5302	FIX sql error when resetting payment mode / term	2018-12-29 07:48:47 +01:00
ldestailleur	2225d0a41e	FIX sql error when resetting payment mode / term	2018-12-28 23:16:44 +01:00
Laurent Destailleur	0f76279a03	FIX Missing token and style	2018-12-27 03:46:14 +01:00
Laurent Destailleur	791b2f485a	FIX Missing token and style	2018-12-27 03:45:30 +01:00
Laurent Destailleur	5c516fdae2	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.form.class.php	2018-12-26 19:43:01 +01:00
Regis Houssin	8f4c452075	FIX replace deprecated "print_fiche_titre" with "load_fiche_titre" ... Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>	2018-12-25 08:34:26 +01:00
Laurent Destailleur	85375495e5	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/core/class/html.form.class.php htdocs/product/class/product.class.php htdocs/public/notice.php htdocs/user/card.php	2018-12-22 19:06:58 +01:00
Laurent Destailleur	9b55cc401e	Fix trans	2018-12-22 11:32:27 +01:00
Laurent Destailleur	ae6596cac7	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-12-21 09:57:29 +01:00
Laurent Destailleur	d9b8a8c8ae	Debug cash fence feature	2018-12-19 16:12:55 +01:00
Laurent Destailleur	b0652494b5	Debug cash fence	2018-12-19 15:40:01 +01:00
Laurent Destailleur	707af49025	FIX Missing last month on vat report per month	2018-12-19 12:07:26 +01:00
Laurent Destailleur	e014fdc20b	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-12-17 11:43:02 +01:00
Laurent Destailleur	6b5c0d1ea1	Save cash fence event into unalterable log	2018-12-17 11:41:59 +01:00
Laurent Destailleur	e06b06c788	Work on cash fence	2018-12-17 10:37:56 +01:00
Laurent Destailleur	e0e298f07b	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-12-17 03:26:15 +01:00
Laurent Destailleur	bf9ee18bed	Standardize code.	2018-12-17 03:25:45 +01:00
Laurent Destailleur	72c5943c55	Execute trigger so we can record line into unalterable log table	2018-12-16 17:53:23 +01:00
Laurent Destailleur	ce2d67f225	Fix phpcs	2018-12-16 17:45:51 +01:00
Laurent Destailleur	e5e4ef7b8c	Work on cash fence	2018-12-16 16:47:09 +01:00
Laurent Destailleur	9ce07b9582	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/langs/en_US/admin.lang	2018-12-16 15:36:18 +01:00
Laurent Destailleur	e366d7d57c	Work on cash fence	2018-12-16 15:30:31 +01:00
Laurent Destailleur	988ba172ae	Clean code of POS modules	2018-12-16 14:59:51 +01:00
Laurent Destailleur	699766223f	Fix phpcs	2018-12-16 13:00:24 +01:00
Laurent Destailleur	5dc9b44931	Fix phpcs	2018-12-16 12:59:59 +01:00
Laurent Destailleur	54a4a54afe	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/menus/standard/eldy.lib.php htdocs/langs/en_US/banks.lang	2018-12-15 20:00:31 +01:00
Laurent Destailleur	2bfc5fe235	Work on cash fence	2018-12-15 19:56:08 +01:00
Laurent Destailleur	1c49599a47	Work on cash fence feature	2018-12-15 19:46:51 +01:00
Laurent Destailleur	0451eb741b	Work on legal cash fence	2018-12-15 19:20:30 +01:00
Laurent Destailleur	8ce6f67773	Fix phpcs	2018-12-15 18:27:38 +01:00
andreubisquerra	cdaf048766	First CashControl version	2018-12-15 16:45:36 +01:00
Laurent Destailleur	1167d9aecb	Merge pull request #10206 from andreubisquerra/master ... First CashControl version	2018-12-15 16:44:24 +01:00
Laurent Destailleur	eb66d45947	Merge branch 'develop' into 10.0_accoutancy_stats	2018-12-15 15:17:15 +01:00
Laurent Destailleur	f55db6dd84	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: dev/resources/dbmodel/dolibarr_schema.mwb	2018-12-15 14:09:16 +01:00
Laurent Destailleur	ec3465e65f	Merge pull request #9995 from delcroip/develop ... Add a link for compta-files.php in the accountancy leftmenue	2018-12-15 12:09:42 +01:00
Laurent Destailleur	b511a056f4	Fix phpcs	2018-12-15 11:48:21 +01:00
Laurent Destailleur	baf9b6f309	Fix regression (bad name of function)	2018-12-14 19:21:19 +01:00
Laurent Destailleur	38ddfd9a62	Merge pull request #10152 from defrance/patch-134 ... refactoring list.php with dol_sql_datefilter	2018-12-14 19:06:29 +01:00
Laurent Destailleur	59bc15377d	CSS	2018-12-14 18:58:55 +01:00
Laurent Destailleur	3571eaee3d	Merge branch 'develop' into NEW_change_order_concat_desc	2018-12-14 17:44:08 +01:00
Laurent Destailleur	abd09ae631	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2018-12-14 17:24:17 +01:00
PMickael	37daface19	[Accounting][VAT] Fix balance should be based on period ... [Accounting][VAT] Fix balance should be based on period	2018-12-14 17:23:45 +01:00
PMickael	5a9d034b1b	[Accounting][VAT] Fix balance should be based on period ... [Accounting][VAT] Fix balance should be based on period	2018-12-14 16:17:25 +01:00
Laurent Destailleur	e7b703f0c0	Merge pull request #10154 from bugness-chl/develop-hookfacturerec ... NEW Adding hooks to facturerec	2018-12-14 16:11:34 +01:00
Laurent Destailleur	c377350c35	Update facture-rec.class.php	2018-12-14 16:09:12 +01:00
Laurent Destailleur	88a52aa11d	Merge branch 'develop' into develop_mc	2018-12-14 15:58:52 +01:00
Laurent Destailleur	2011afe6fb	Merge branch 'develop' into actionrefused	2018-12-14 15:48:24 +01:00
Laurent Destailleur	83efdee7d3	Merge branch 'develop' into new_mass_generate	2018-12-14 15:44:46 +01:00
Laurent Destailleur	611ccc4a9a	Merge branch 'develop' into fieldlabel	2018-12-14 15:42:01 +01:00
Laurent Destailleur	5dabefe227	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2018-12-13 20:49:55 +01:00
Laurent Destailleur	f97b561af0	Merge branch 'develop' into qual_rename_facnumber	2018-12-13 20:24:12 +01:00
Laurent Destailleur	4a61c1b6ed	FIX lang not loaded	2018-12-11 13:25:09 +01:00
andreubisquerra	939f31c71f	First CashControl version	2018-12-08 21:33:54 +01:00
Laurent Destailleur	21b3bbc2e6	Merge	2018-12-08 11:55:27 +01:00
Laurent Destailleur	a915d82883	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2018-12-08 11:42:30 +01:00
Laurent Destailleur	5ce26bae1b	Fix form of bank info for CH	2018-12-04 22:01:35 +01:00
Laurent Destailleur	138640fc63	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/class/commande.class.php htdocs/contrat/class/contrat.class.php htdocs/expensereport/class/expensereport.class.php htdocs/fourn/class/fournisseur.commande.class.php	2018-12-04 14:58:11 +01:00
Laurent Destailleur	8e333c3feb	Standardize code	2018-12-04 14:54:58 +01:00
Laurent Destailleur	d80baaea69	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/commande/class/commande.class.php htdocs/contrat/class/contrat.class.php htdocs/expensereport/class/expensereport.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/class/fournisseur.facture.class.php	2018-12-04 14:29:47 +01:00
Laurent Destailleur	275eeca135	Trans	2018-12-04 13:09:58 +01:00
Chl	b67101c77c	corr. #10154	2018-12-03 18:09:25 +01:00
Ferran Marcet	7247b14bd9	FIX Lines are not inserted correctly if VAT have code	2018-12-03 12:28:17 +01:00
Regis Houssin	8953a3ed73	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_mc Conflicts: ChangeLog	2018-12-03 08:46:03 +01:00
Maxime Kohlhaas	2e496ea83a	QUAL rename facnumber by ref	2018-12-02 17:33:44 +01:00
Alexandre SPANGARO	088c002ed1	NEW: Add stats on entries & movements by fiscal year	2018-12-02 11:01:11 +01:00
Chl	864ce85341	NEW adding hooks to createRecurringInvoices() ... For example : send the newly generated invoice by mail. We send the counter and the total so launching some action on the last loop (generated invoice or error) is possible. (bonus: correcting error reporting $this->errors to $this->errors[] )	2018-12-02 01:34:13 +01:00
Chl	95b5d8790d	corr. typo	2018-12-02 01:34:13 +01:00
Chl	6ea0919ebb	facture-rec.class.php: reindent	2018-12-02 01:34:13 +01:00
BENKE Charlene	6ac3cfdd99	Update list.php	2018-12-01 23:48:36 +01:00
BENKE Charlene	b104c0889d	Update list.php	2018-12-01 23:44:24 +01:00
BENKE Charlene	f07d1411aa	Update list.php	2018-12-01 23:41:15 +01:00
Laurent Destailleur	ef3a280f40	Merge pull request #10082 from grandoc/new_branch_26_11_2018 ... fix typo error	2018-11-29 10:57:48 +01:00
Philippe GRAND	2b6810e2ab	FIX: bad URL	2018-11-28 16:37:49 +01:00
Laurent Destailleur	436a85ef7a	Fix missing email	2018-11-27 20:34:43 +01:00
Laurent Destailleur	0367795488	Fix auto jump on record if only 1 record in a search	2018-11-27 11:09:47 +01:00
Philippe GRAND	9bf0f12068	fix typo error	2018-11-26 14:32:04 +01:00
Laurent Destailleur	ed1062c440	Css	2018-11-25 11:59:49 +01:00
Laurent Destailleur	f0e4c262a3	Merge pull request #10067 from ATM-Thibault/NEW_global_search_go_direct_on_card ... FIX Support of option MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE was not complete	2018-11-24 11:13:49 +01:00
Laurent Destailleur	0a057c8277	Clean var_dump	2018-11-22 20:47:53 +01:00
Laurent Destailleur	fe35e72e83	Fix perf. Make only one request per group for year N-1.	2018-11-22 20:45:50 +01:00
Laurent Destailleur	5727cf2910	Prepare code for performance enhancement	2018-11-22 20:09:27 +01:00
Laurent Destailleur	72fc0226e3	Optimize performance: Remove call for year N, can be done with total of ... each month	2018-11-22 19:45:35 +01:00
Thibault Descamps	d63d8088ed	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_global_search_go_direct_on_card	2018-11-22 11:37:25 +01:00
Thibault Descamps	c2e5a29246	NEW redirect if only one result on global search on card	2018-11-22 11:36:30 +01:00
Laurent Destailleur	784c13d9d0	Fix label of month	2018-11-22 11:14:05 +01:00
Laurent Destailleur	21e9c02b11	Performance enhancement in Accounting Personalized report	2018-11-22 10:40:15 +01:00
Thibault Descamps	1cc130e5f6	NEW : conf to change concat desc order	2018-11-21 09:57:44 +01:00
Laurent Destailleur	be4dc40dfa	Fix standardize date format for payment between customer and supplier	2018-11-20 10:16:54 +01:00
Laurent Destailleur	4845e90d95	Fix update of hours for payment	2018-11-20 10:03:38 +01:00
Laurent Destailleur	4bf5a12f35	Fix trans	2018-11-20 09:56:03 +01:00
Laurent Destailleur	c0dac69116	Merge pull request #10031 from aspangaro/9.0_style ... Fix Page Salaries stats - Look & feel v9	2018-11-19 18:14:35 +01:00
Alexandre SPANGARO	4e39065e29	Fix Page Salaries stats - Look & feel v9	2018-11-17 07:37:32 +01:00
atm-quentin	a0d5607ba5	FIX error travis	2018-11-16 15:29:05 +01:00
atm-quentin	56d4a8a737	revert some code	2018-11-16 15:16:48 +01:00
atm-quentin	70fdff5c27	revert getNextValue function + createfromclone entity	2018-11-16 11:23:14 +01:00
atm-quentin	c18f486179	set facture to invoice AND check invoicenumber conf	2018-11-16 11:20:03 +01:00
atm-quentin	e004fc2f5b	FIX block page if cant fetch	2018-11-16 11:17:34 +01:00
atm-quentin	a8ab666d62	remplacement en masse des $conf->entity par des getEntity('facture')	2018-11-16 11:17:18 +01:00
atm-quentin	8e51204dff	manage invoice with multicompany	2018-11-16 11:14:33 +01:00
Frédéric FRANCE	ce6b7adaa0	Merge remote-tracking branch 'upstream/develop' into actionrefused	2018-11-15 22:15:45 +01:00
Frédéric FRANCE	12dcda7e02	Merge remote-tracking branch 'upstream/develop' into fieldlabel	2018-11-15 22:01:36 +01:00
Regis Houssin	ffc9b02322	FIX missing one column	2018-11-15 18:28:12 +01:00
Regis Houssin	2d2e836965	FIX more simple	2018-11-15 17:45:33 +01:00
Regis Houssin	aaa9a4f47c	FIX use getEntity('invoice') instead getEntity('facture')	2018-11-15 17:27:49 +01:00
Laurent Destailleur	e1407c8289	Merge pull request #10012 from hregis/develop_mc ... FIX compatibility between proposal sharing and proposalnumber sharing	2018-11-15 17:19:28 +01:00
Laurent Destailleur	d20bb41cde	Merge pull request #10017 from hregis/8.0_bug ... FIX avoid error if $object->fk_account =< 0 for getNomUrl	2018-11-15 16:43:00 +01:00
Regis Houssin	6f90516f57	FIX check write permission for multicurrency	2018-11-15 09:40:08 +01:00
Regis Houssin	bcc83408e0	FIX avoid error if $object->fk_account =< 0 for getNomUrl	2018-11-14 18:10:41 +01:00
Regis Houssin	976094043b	FIX missing GETPOST('entity')	2018-11-14 17:34:27 +01:00
Regis Houssin	3294fada3d	FIX working on invoice sharing (multicompany)	2018-11-14 14:59:36 +01:00
Frédéric FRANCE	731d19a29b	add tooltip to butActionRefused	2018-11-13 21:40:17 +01:00
patrick Delcroix	e9d3db084a	new: link to the compta-files.php in the accountancy left menu	2018-11-10 15:35:56 +01:00
Frédéric FRANCE	09efde4901	Merge remote-tracking branch 'upstream/develop' into fieldlabel	2018-11-09 18:13:59 +01:00
Regis Houssin	89389baeac	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email	2018-11-09 15:37:29 +01:00
Laurent Destailleur	c74ad61365	Fix look and feel v8	2018-11-08 10:04:25 +01:00
Laurent Destailleur	976516a796	Fix look and feel v8	2018-11-08 09:51:46 +01:00
Laurent Destailleur	66ffcf287a	Fix filter on extrafields	2018-11-07 12:49:17 +01:00
Laurent Destailleur	4a25317f10	Fix security on GETPOST('action'). Param must be sanitized.	2018-11-05 20:29:07 +01:00
Laurent Destailleur	c0f4ec5a3e	FIX sanitize param $action	2018-11-05 17:53:31 +01:00
Laurent Destailleur	0c7f33e1ba	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-11-05 09:58:19 +01:00
Laurent Destailleur	2900947019	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-11-05 09:56:57 +01:00
Laurent Destailleur	e1e0001fda	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-11-05 09:56:00 +01:00
Frédéric FRANCE	da3ee9ad9a	Merge remote-tracking branch 'upstream/develop' into fieldlabel	2018-10-30 19:04:35 +01:00
Regis Houssin	9589f69574	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_email Conflicts: htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php	2018-10-30 18:29:28 +01:00
Laurent Destailleur	68f6ebd0ff	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/class/commande.class.php htdocs/core/lib/security.lib.php htdocs/modulebuilder/template/myobject_card.php	2018-10-30 14:47:39 +01:00
Laurent Destailleur	0127682996	Merge pull request #9881 from grandoc/8.0 ... merging and typo	2018-10-30 12:41:56 +01:00
Laurent Destailleur	8fbf5b1f33	FIX deletion on draft is allowed if we are allwoed to create	2018-10-29 18:28:19 +01:00
Laurent Destailleur	0266db7aa8	FIX deletion on draft is allowed if we are allwoed to create	2018-10-29 18:19:40 +01:00
Laurent Destailleur	d02fccd7e4	Fix deletion of draft invoice	2018-10-29 14:56:00 +01:00
Laurent Destailleur	824757bca6	Fix perm to delete	2018-10-29 14:47:33 +01:00
Laurent Destailleur	27d82d0e8e	FIX Delete of draft invoice	2018-10-29 14:41:00 +01:00
Laurent Destailleur	85b8c9f219	FIX Delete of draft invoice	2018-10-29 14:35:42 +01:00
Frédéric FRANCE	fe5056add8	remove fieldlabel and add fieldeditkey	2018-10-27 18:07:05 +02:00
Frédéric FRANCE	42a9abad56	remove fieldlabel and add fieldeditkey	2018-10-27 17:45:29 +02:00
Regis Houssin	569d59d251	FIX change my deprecated email	2018-10-27 14:43:12 +02:00
Maxime Kohlhaas	1b054f1b36	Fix invoice creation from contract was invoicing closed services #9087	2018-10-27 09:21:49 +02:00
Laurent Destailleur	087b68948d	Fix: do not use point for graph with too many points.	2018-10-26 17:32:32 +02:00
Laurent Destailleur	852b069785	Fix reponsive in stats pages	2018-10-26 15:46:17 +02:00
Philippe GRAND	f450e04856	Merge remote-tracking branch 'upstream/8.0' into 8.0	2018-10-26 15:38:15 +02:00
Frédéric FRANCE	86d854f3f4	Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose	2018-10-24 23:04:26 +02:00
Laurent Destailleur	c9dca22df2	Merge pull request #9854 from atm-john/NEW_missing_payment_date_col ... NEW Add due date column in payment lists	2018-10-24 12:27:59 +02:00
Laurent Destailleur	65a39269d9	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/core/class/commondocgenerator.class.php	2018-10-24 03:39:33 +02:00
Laurent Destailleur	01adaf253c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/bank/class/account.class.php htdocs/product/list.php	2018-10-24 03:35:44 +02:00
Laurent Destailleur	1d80e16ad1	Merge pull request #9831 from frederic34/payment ... payments	2018-10-24 03:25:01 +02:00
Laurent Destailleur	f8316abfc0	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/compta/bank/class/account.class.php htdocs/theme/md/style.css.php	2018-10-24 02:58:29 +02:00
Laurent Destailleur	919c4fc5bc	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/theme/md/style.css.php	2018-10-24 02:40:57 +02:00
atm-john	bed5084bcf	Add missing Max payment date col	2018-10-23 21:44:45 +02:00
Laurent Destailleur	c8aa884462	Fix search all	2018-10-23 17:16:46 +02:00
Frédéric FRANCE	5f6cbda5a6	Update facture.class.php	2018-10-20 22:34:00 +02:00
Frédéric FRANCE	fbc5ce623e	payments	2018-10-20 17:17:21 +02:00
Laurent Destailleur	b32ffdbbb9	Clean code	2018-10-19 14:59:00 +02:00
Laurent Destailleur	6a6a8ae14b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-19 14:29:22 +02:00
Laurent Destailleur	5a1a5548df	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/core/actions_massactions.inc.php htdocs/core/class/discount.class.php htdocs/core/lib/payments.lib.php htdocs/product/index.php htdocs/product/list.php htdocs/societe/class/societe.class.php	2018-10-19 14:27:15 +02:00
Laurent Destailleur	762d82f2fe	Move declaration into common	2018-10-19 13:38:05 +02:00
Laurent Destailleur	cff2b923f9	Merge pull request #9784 from ptibogxiv/patch-80 ... FIX harmony in date name with API	2018-10-19 13:29:59 +02:00
Frédéric FRANCE	256ee40d0a	Merge remote-tracking branch 'upstream/develop' into patch-16	2018-10-18 21:01:49 +02:00
Laurent Destailleur	05326e271d	FIX Filter on invoice type	2018-10-18 17:15:26 +02:00
Laurent Destailleur	7cafdc4d9a	Fix phpcs	2018-10-18 16:56:43 +02:00
gauthier	aea7299970	FIX : use discount with multicurrency	2018-10-17 15:49:08 +02:00
Frédéric FRANCE	7d8ff04292	Update paiement.class.php	2018-10-17 08:15:12 +02:00
ptibogxiv	a77458cb36	Update facture.class.php	2018-10-17 00:07:21 +02:00
ptibogxiv	3fdf3c95b4	FIX harmony in date name with API	2018-10-17 00:04:44 +02:00
Frédéric FRANCE	2e77b9fed9	fix phpunit	2018-10-16 22:42:18 +02:00
Laurent Destailleur	8d815c4e6b	Merge pull request #9766 from ptibogxiv/patch-73 ... ADD support of external modepayment	2018-10-16 20:30:24 +02:00
Laurent Destailleur	f1c85cb36d	Merge pull request #9757 from frederic34/patch-9 ... do not trim int	2018-10-16 19:37:07 +02:00
Laurent Destailleur	97429aeb7a	Merge pull request #9721 from grandoc/new_branch_10_10_2018 ... Standardize and update code	2018-10-16 19:30:19 +02:00
Laurent Destailleur	2c1e8d6535	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/bookkeeping/balance.php htdocs/expedition/class/expeditionbatch.class.php htdocs/public/payment/newpayment.php htdocs/stripe/config.php	2018-10-16 18:47:11 +02:00
ptibogxiv	d377fc26b4	ADD support of external modepayment	2018-10-16 16:55:25 +02:00
Philippe GRAND	729ff0b9bb	Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018	2018-10-16 14:20:11 +02:00
Frédéric FRANCE	7492d42ad8	do not trim int	2018-10-15 18:47:12 +02:00
Laurent Destailleur	5d9b770511	phpcs	2018-10-15 13:32:09 +02:00
Laurent Destailleur	df4b3b09d2	Fix var not defined	2018-10-15 13:30:07 +02:00
Laurent Destailleur	abf8867061	Merge pull request #8207 from atm-john/New_invoice_default_documents ... NEW hidden option to define an invoice template for each invoice type	2018-10-14 16:36:37 +02:00
Maxime Kohlhaas	9be8c579d0	New massaction to generate PDF	2018-10-14 15:50:55 +02:00
Philippe GRAND	d98ebbd9ee	Standardize and update code	2018-10-13 10:39:27 +02:00
Laurent Destailleur	a2aa491c51	Merge pull request #9728 from atm-john/8.0_Fix_count_error ... Fix count on no countable object	2018-10-12 17:52:30 +02:00
Laurent Destailleur	1ab6cd4b59	Update card.php	2018-10-12 17:51:32 +02:00
Laurent Destailleur	99fde00902	Merge pull request #9719 from frederic34/patch-11 ... do not trim int	2018-10-12 17:35:04 +02:00
John BOTELLA	92686100b2	Fix count on no countable object	2018-10-11 10:51:54 +02:00
John BOTELLA	ee225a2b8b	FIX situation prev percent	2018-10-11 10:14:22 +02:00
Laurent Destailleur	7f1aa217a6	Fix link	2018-10-10 18:38:53 +02:00
Laurent Destailleur	82e06eda75	FIX save search criteria when going on receipt from bank transaction	2018-10-10 18:33:32 +02:00
Laurent Destailleur	6446343e1b	Fix sort lost	2018-10-10 13:05:19 +02:00
Laurent Destailleur	cb29209457	NEW Enhancement in process to make manual bank conciliation	2018-10-10 12:47:18 +02:00
Laurent Destailleur	562ee1cb64	FIX checkbox to conciliate not visible if bank receipt nb known	2018-10-10 12:19:22 +02:00
Laurent Destailleur	8f4b74733c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/class/adherent.class.php	2018-10-10 01:51:54 +02:00
Laurent Destailleur	b73a2a24ef	FIX Tooltip on invoice widget	2018-10-10 01:16:53 +02:00
Frédéric FRANCE	03fcc2f088	Update paymentvarious.class.php	2018-10-09 20:31:14 +02:00
Frédéric FRANCE	b917fd0cf2	do not trim int	2018-10-09 19:41:53 +02:00
Laurent Destailleur	1d04ce2185	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/functions.lib.php	2018-10-09 17:07:32 +02:00
Laurent Destailleur	01c32525df	Merge	2018-10-09 17:06:08 +02:00
Laurent Destailleur	84605bc59b	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-10-09 16:59:47 +02:00
Philippe GRAND	52369bcb2b	Standardize and update code	2018-10-09 15:46:10 +02:00
Philippe GRAND	e9bd1be41b	Standardize and update code	2018-10-09 15:38:42 +02:00
Laurent Destailleur	dfe9c05d2f	Merge menu entry for tags/categories as submenu of element.	2018-10-09 15:26:15 +02:00
Laurent Destailleur	0938ac4afa	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/user/list.php	2018-10-09 14:54:18 +02:00
Laurent Destailleur	3c8b365c3e	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-09 14:53:39 +02:00
Philippe GRAND	bba6669f03	Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018	2018-10-09 08:47:26 +02:00
Laurent Destailleur	35d5a495de	Save pos_source with id of POS station	2018-10-08 22:51:20 +02:00
Laurent Destailleur	41f2289ffa	Save pos station into invoice	2018-10-08 22:28:30 +02:00
Nicolas Aupetit	c26fe00362	fix bank ref override "bordereau cheque" ref	2018-10-09 02:15:38 +11:00
Laurent Destailleur	19cf649b48	Add field to track source module of invoice	2018-10-07 13:59:40 +02:00
Philippe GRAND	83db36f9b2	Standardize code	2018-10-06 12:11:48 +02:00
Nicolas Aupetit	49693854ce	Typo fix: "eee" in localtax1 display	2018-10-06 13:51:46 +11:00
Philippe GRAND	94df8d297d	Standardize code	2018-10-05 15:44:57 +02:00
Philippe GRAND	c7c3780400	clean code	2018-10-05 15:34:32 +02:00
Marc de Lima Lucio	82651cd920	FIX: invoice stats: situation invoices were not counted	2018-10-05 12:12:04 +02:00
Laurent Destailleur	41add1c251	Standardize code	2018-10-04 19:19:29 +02:00
Laurent Destailleur	6fcb45cf40	Rename page various_payment/index.php into list.php (coding rule)	2018-10-04 19:10:39 +02:00
Laurent Destailleur	17e4af50ec	Merge pull request #9680 from ATM-Nicolas/fix_wrong_variable_name ... FIX : Wrong variable name	2018-10-04 18:47:08 +02:00
Laurent Destailleur	20f45db6b8	Merge pull request #9677 from grandoc/new_branch_04_10_2018 ... Standardize and update code	2018-10-04 18:33:24 +02:00
Laurent Destailleur	5034264d60	Debug / Standardize code	2018-10-04 18:27:49 +02:00
Laurent Destailleur	ebba33635b	Close #9674 by keeping old code present (this help for transition tests)	2018-10-04 18:20:57 +02:00
Laurent Destailleur	b3b2305651	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/class/commande.class.php htdocs/core/lib/pdf.lib.php	2018-10-04 17:56:56 +02:00
Laurent Destailleur	13759ea146	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/commande/class/commande.class.php htdocs/compta/facture/class/facture.class.php	2018-10-04 17:53:40 +02:00
John BOTELLA	0e310a7ffd	FIX invoice delay on invoice list	2018-10-04 14:11:51 +02:00
John BOTELLA	0b3d09fa64	Fix retained warranty delay on list	2018-10-04 12:01:24 +02:00
John BOTELLA	cf89b850ee	Fix retained warranty delay	2018-10-04 11:37:04 +02:00
John BOTELLA	55e26dc531	FIX invoice has delay	2018-10-04 11:09:16 +02:00
ATM-Nicolas	c048f51562	FIX : Wrong variable name	2018-10-04 09:54:40 +02:00
Philippe GRAND	8bee69277d	Standardize and update code	2018-10-04 09:33:30 +02:00
aplose	8ee7a48583	Fix issue #9434 : no array_options available when calling api : ... I replace the deprecated code by the fetch_optionnals() recommanded call.	2018-10-03 15:15:46 +02:00
John BOTELLA	af66a8971a	NEW Hidden conf INVOICE_USE_DEFAULT_DOCUMENT	2018-10-02 15:51:17 +02:00
John BOTELLA	30d62e9fc5	fix retained warranty amount	2018-10-01 15:19:35 +02:00
Laurent Destailleur	ae62204a79	Merge pull request #9628 from grandoc/new_branch_28_09_2018 ... Standardize and update code	2018-10-01 01:04:36 +02:00
Laurent Destailleur	adc36e7d63	Clean code	2018-10-01 00:20:47 +02:00
Laurent Destailleur	2f88f84e3b	Clean code	2018-09-28 22:13:42 +02:00
Laurent Destailleur	e2f450aa8c	Fix regession losing description. ... Rename updateligne into updateline.	2018-09-28 16:15:17 +02:00
Philippe GRAND	15ff9f8917	Standardize and update code	2018-09-28 14:44:47 +02:00
Laurent Destailleur	118ff2d8d0	phpcs	2018-09-28 10:42:42 +02:00
John BOTELLA	d8cd1c3fef	Fix total retained warranty	2018-09-28 09:03:37 +02:00
Laurent Destailleur	a88dcfd1e4	Fix phpcs	2018-09-28 02:24:11 +02:00
John BOTELLA	70eddf5d55	Add retained warranty in list	2018-09-27 15:38:43 +02:00
Laurent Destailleur	e252a5f046	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-27 12:55:45 +02:00
Laurent Destailleur	62b31df069	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/rssparser.class.php htdocs/langs/en_US/boxes.lang	2018-09-27 12:55:25 +02:00
Laurent Destailleur	26d20d0b76	Merge pull request #8729 from atm-quentin/NEW_rights_ignoring_min_price ... NEW Advanced permission to ignore price min	2018-09-27 09:57:49 +02:00
Laurent Destailleur	ee8b5030a0	Merge pull request #9610 from atm-john/FIX_situation_credit_note ... Fix situation credit note	2018-09-27 09:26:23 +02:00
Laurent Destailleur	e3b1cb9fdb	Update facture.class.php	2018-09-27 09:25:37 +02:00
Philippe GRAND	746d73b8e6	Add some code comment	2018-09-25 17:26:57 +02:00
John BOTELLA	40369280ba	fix allow empty selection on form conditions reglement	2018-09-25 12:16:16 +02:00
John BOTELLA	022f842cb0	Fix display good progress for new situation invoices	2018-09-25 10:28:47 +02:00
John BOTELLA	791c373db5	FIX credit note progression	2018-09-25 09:54:58 +02:00
Laurent Destailleur	b93ab79679	FIX Error messages	2018-09-25 00:39:28 +02:00
John BOTELLA	b1380a6902	FIX situation invoice total with credit note	2018-09-24 16:12:00 +02:00
Laurent Destailleur	ad6895aa2e	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-24 10:23:09 +02:00
Laurent Destailleur	57e359cd40	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/langs/en_US/admin.lang htdocs/langs/fr_FR/agenda.lang	2018-09-24 10:18:13 +02:00
Laurent Destailleur	dbb75e35a1	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/compta/facture/list.php htdocs/langs/en_US/admin.lang htdocs/langs/fr_FR/agenda.lang	2018-09-24 10:14:38 +02:00
Laurent Destailleur	f88170e22a	Merge pull request #9596 from tuxgasy/dev_bank_treso_hooks ... NEW Add somes hooks in bank planned entries	2018-09-23 15:49:50 +02:00
TuxGasy	db223af39b	Add somes hooks in bank planned entries	2018-09-22 18:44:00 +02:00
Philippe Grand	239be3b58c	Merge branch 'develop' into new_branch_20_09_2018	2018-09-21 10:12:48 +02:00
Laurent Destailleur	b05954fb1e	Merge pull request #9061 from delcroip/comptafiles ... NEW: Page to check if the operations/itemw created between two dates have attached item(s) and possibility to download all attachements	2018-09-20 19:45:46 +02:00
Philippe GRAND	803505b6b7	Standardize and update code	2018-09-20 12:27:06 +02:00
Frédéric FRANCE	126e5ae3ad	remove not needed require	2018-09-18 20:05:48 +02:00
Frédéric FRANCE	032f9729a5	correct trimParameters	2018-09-18 19:05:00 +02:00
Laurent Destailleur	61f5a2e899	Merge pull request #9533 from frederic34/trimParameters ... trimParameters function	2018-09-18 15:04:32 +02:00
Laurent Destailleur	e65ec9f4ef	Merge pull request #9530 from frederic34/patch-15 ... reduce complexity of cchargesociales class	2018-09-18 15:02:44 +02:00
Laurent Destailleur	e6791e1763	Merge pull request #9526 from frederic34/patch-10 ... completely comment unused code	2018-09-18 14:59:55 +02:00
Philippe GRAND	a1b15f170e	Standardize and update code	2018-09-17 09:00:23 +02:00
Frédéric FRANCE	f935701d30	trimParameters	2018-09-16 15:35:19 +02:00
Frédéric FRANCE	b950043618	trimParameters	2018-09-16 15:16:08 +02:00
Frédéric FRANCE	367e202df0	reduce complexity of cchargesociales class	2018-09-16 13:54:17 +02:00
Laurent Destailleur	ab0f842db6	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-16 12:55:44 +02:00
Laurent Destailleur	74a9c680df	FIX "Other ..." link so the "Back to" link works.	2018-09-16 12:27:56 +02:00
Laurent Destailleur	f7c2bd877a	Comment dead code	2018-09-16 10:39:30 +02:00
Laurent Destailleur	d6ee00f2e7	Fix constructors does not need return value	2018-09-16 10:22:23 +02:00
Frédéric FRANCE	7b3b020533	completely comment unused code	2018-09-16 09:41:38 +02:00
Laurent Destailleur	5eff159e27	Merge pull request #9489 from frederic34/patch-9 ... Completely comment unused code	2018-09-15 16:59:49 +02:00
Laurent Destailleur	961505d510	NEW Add filter on staff range in list of thirdparties	2018-09-14 01:29:03 +02:00
Frédéric FRANCE	a128ea821e	Completely comment unused code	2018-09-12 22:49:32 +02:00
Frédéric FRANCE	987fdbe73c	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-12 21:29:41 +02:00
Frédéric FRANCE	ce76a2e714	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-12 20:21:35 +02:00
Laurent Destailleur	82580cadf6	Merge pull request #9458 from frederic34/patch-17 ... Update account.class.php	2018-09-12 19:07:19 +02:00
Frédéric FRANCE	3e71f4e6b0	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-12 18:36:49 +02:00
Frédéric FRANCE	998b67fa98	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-12 18:32:15 +02:00
Laurent Destailleur	de8496773d	Merge pull request #9441 from grandoc/new_branch_09_09_2018 ... New branch 09 09 2018	2018-09-12 18:24:34 +02:00
Laurent Destailleur	6291f18179	Merge pull request #9440 from frederic34/patch-5 ... Upper Lower Casing	2018-09-12 18:24:02 +02:00
Laurent Destailleur	3662ebe3a3	Fix syntax error	2018-09-12 18:05:20 +02:00
Laurent Destailleur	fcabe67e4b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-12 13:30:28 +02:00
Maxime Kohlhaas	c94689e9a9	FIX remain to pay for credit note was wrong on invoice list	2018-09-12 11:53:57 +02:00
Laurent Destailleur	aad6a0871f	FIX Lose filter on payment type or category after a sort on invoice list ... Conflicts: htdocs/compta/facture/list.php	2018-09-12 10:59:53 +02:00
Laurent Destailleur	7bea9f5ffb	FIX Lose filter on payment type or category after a sort on invoice list	2018-09-12 10:57:09 +02:00
delcroix Patrick	2a4c65726c	new: delete zip after download ... and correct date 2.0	2018-09-11 22:14:58 +02:00
delcroix Patrick	e36bc24dee	fix:copyrights	2018-09-11 21:55:05 +02:00
delcroix Patrick	e3920edb79	correct for invoice supplier links	2018-09-11 21:53:47 +02:00
Frédéric FRANCE	cdc5a174aa	Update account.class.php	2018-09-11 00:29:01 +02:00
Frédéric FRANCE	7e0b1055db	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-09 13:36:53 +02:00
Frédéric FRANCE	f02b2f0239	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-09 13:35:58 +02:00
Philippe GRAND	b40fe8e4c9	Standardize and update code	2018-09-09 12:07:14 +02:00
Frédéric FRANCE	a558c3bdac	replace select_date	2018-09-09 11:25:59 +02:00
Philippe GRAND	7fcbd0fe42	Standardize and update code	2018-09-09 11:10:32 +02:00
Frédéric FRANCE	c2ad09cc0e	replace select_date	2018-09-09 10:11:27 +02:00
Frédéric FRANCE	b2a58067d9	replace select_date	2018-09-09 09:56:33 +02:00
Frédéric FRANCE	a3fa13994b	replace select_date	2018-09-09 09:36:12 +02:00
Frédéric FRANCE	ee8d56e047	Update card.php	2018-09-08 23:18:38 +02:00
Frédéric FRANCE	ef2ee8a6e4	Update card.php	2018-09-08 23:17:29 +02:00
Laurent Destailleur	84bbe8684b	Fix scrutinizer	2018-09-08 18:38:24 +02:00
Frédéric FRANCE	80880d8fb9	replace select_date by selectDate	2018-09-08 13:00:39 +02:00
Frédéric FRANCE	2b62c4ca8f	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-08 10:50:27 +02:00
Laurent Destailleur	bcfb5fc42e	Merge pull request #9425 from atm-maxime/8.0 ... FIX : Homepage links were using wrong topmenus	2018-09-07 19:35:10 +02:00
Laurent Destailleur	0ef17fe581	FIX Problems with permissions of module to record payment of salaries	2018-09-07 13:32:56 +02:00
Maxime Kohlhaas	a5f4a74ecc	FIX : Homepage links were using wrong topmenus	2018-09-06 14:49:48 +02:00
Philippe GRAND	9025fd5891	Merge branch '8.0' of https://github.com/Dolibarr/dolibarr into 8.0	2018-09-06 14:33:46 +02:00
Philippe GRAND	844333688b	typo	2018-09-06 14:33:22 +02:00
Frédéric FRANCE	4e619dd0ed	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-05 18:51:21 +02:00
Philippe GRAND	056b0b26cc	fix : Public member variable _fetched must not be prefixed with an underscore	2018-09-05 15:39:04 +02:00
Philippe GRAND	38ca6096b2	Standardize and update code	2018-09-05 10:31:12 +02:00
Frédéric FRANCE	7799774ca1	move phpcs:ignore	2018-09-04 22:52:55 +02:00
Laurent Destailleur	ab8155f170	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/class/commande.class.php htdocs/compta/facture/card.php htdocs/filefunc.inc.php	2018-09-04 21:35:43 +02:00
Frédéric FRANCE	65b74ad30f	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-04 20:48:35 +02:00
Frédéric FRANCE	bdcac95761	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-04 15:15:23 +02:00
Philippe GRAND	0492492df1	fix merge	2018-09-04 12:30:06 +02:00
Laurent Destailleur	3ef808cb9b	Fix #9302 MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES broken	2018-09-04 11:23:28 +02:00
Laurent Destailleur	9042d341f0	FIX #9316 Error when listing invoices	2018-09-04 11:19:31 +02:00
Laurent Destailleur	e7d2bcc34c	FIX #9316 Error when listing invoices	2018-09-04 11:17:08 +02:00
Laurent Destailleur	9697bdf3b0	FIX #9393 inconsistency behaviour. option FACTURE_ENABLE_NEGATIVE_LINES	2018-09-04 10:38:09 +02:00
Laurent Destailleur	db6f80e2ff	FIX invoice popup hide localtax2 and 3 if not defined	2018-09-04 00:42:15 +02:00
Laurent Destailleur	3d50c454c1	Code comment	2018-09-03 17:05:44 +02:00
Frédéric FRANCE	22b9632555	move phpcs:ignore	2018-09-02 21:08:57 +02:00
Frédéric FRANCE	35232b753a	move phpcs:ignore	2018-09-02 20:37:12 +02:00
Frédéric FRANCE	2a5c994009	move phpcs:ignore	2018-09-02 14:01:37 +02:00
Frédéric FRANCE	04c1a7d4af	move phpcs:ignore	2018-09-02 13:38:11 +02:00
Philippe GRAND	3de16a145e	Standardize and update code	2018-09-02 11:08:41 +02:00
Philippe GRAND	c4f05aff28	Standardize and update code	2018-09-02 10:42:31 +02:00
Frédéric FRANCE	47879d44bc	move phpcs:ignore	2018-09-02 09:57:19 +02:00
Philippe GRAND	ae2df6be11	Standardize and Update code	2018-09-01 23:04:46 +02:00
Philippe GRAND	5d273960dc	fix conflict	2018-09-01 22:40:38 +02:00
Laurent Destailleur	c8912d6a4f	Merge pull request #9242 from frederic34/camelCaps ... mark non camelCaps function	2018-09-01 15:37:56 +02:00
Philippe GRAND	f77dd2ebc7	Standardize and update code	2018-09-01 15:13:59 +02:00
Philippe GRAND	c013f9cf3d	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2018-09-01 15:13:04 +02:00
Laurent Destailleur	c2548b8b39	Merge pull request #9298 from ksar-ksar/Upd_hook_formConfirm ... NEW hook formConfirm always called if hooked	2018-09-01 14:50:08 +02:00
Philippe GRAND	17e349eba2	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2018-09-01 14:27:53 +02:00
Laurent Destailleur	bcee0ef0ae	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/fourn/commande/dispatch.php htdocs/societe/class/societe.class.php htdocs/stripe/config.php	2018-09-01 14:16:57 +02:00
Philippe GRAND	7b47c79bc3	precise label comment	2018-09-01 14:06:58 +02:00
Frédéric FRANCE	57fb3dc2f4	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-09-01 13:52:51 +02:00
Philippe GRAND	7354e485b0	precise label comment	2018-09-01 13:22:08 +02:00
Philippe GRAND	1944ef0dc3	conflict resolution	2018-09-01 12:38:22 +02:00
Laurent Destailleur	b863b5176d	Merge pull request #9322 from grandoc/new_branch_29_08_2018 ... New branch 29 08 2018	2018-09-01 12:11:01 +02:00
Philippe GRAND	bb05e80a87	Standardize and update code	2018-08-31 18:47:25 +02:00
Philippe GRAND	edaa575435	Standardize and update code	2018-08-31 18:36:15 +02:00
Philippe GRAND	2f307aae21	Standardize and update code	2018-08-31 18:06:17 +02:00
Philippe GRAND	9e880d3e72	Standardize and update code	2018-08-31 17:55:31 +02:00
Laurent Destailleur	6af8f8f475	Fix trans	2018-08-31 16:57:50 +02:00
Philippe Grand	b3c84ac3bc	Merge branch 'develop' into new_branch_29_08_2018	2018-08-30 12:09:40 +02:00
Philippe GRAND	2e66c65650	WTF...	2018-08-30 12:03:20 +02:00
ksar-ksar	49d3bea192	Remove the test ... After discussion with Frederic, the best solution is to remove the test	2018-08-30 11:27:48 +02:00
Frédéric FRANCE	6aee680a4f	PSR2 ClassDeclaration	2018-08-29 22:06:05 +02:00
Frédéric FRANCE	b03f4004ea	PSR2 FunctionClosingBrace	2018-08-29 21:25:22 +02:00
Frédéric FRANCE	cbdc669ba9	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-29 18:45:36 +02:00
Frédéric FRANCE	7b2bfb28c2	Merge remote-tracking branch 'upstream/develop' into trimtrailing2	2018-08-29 12:48:12 +02:00
Philippe Grand	0ab593fdb1	Merge branch 'develop' into new_branch_29_08_2018	2018-08-29 12:47:01 +02:00
Philippe GRAND	4b7dd5ace3	Fix white spaces	2018-08-29 12:29:05 +02:00
Philippe GRAND	88ad651743	Fix white spaces	2018-08-29 12:26:47 +02:00
Philippe GRAND	e92b96acfd	try to fix space errors	2018-08-29 12:00:53 +02:00
Laurent Destailleur	0eb4f8bb96	NEW Can set the datestart and dateend of cron job into module descriptor	2018-08-29 11:47:20 +02:00
Laurent Destailleur	b5c2383f65	Fix type of invoice encoded twice	2018-08-28 18:34:53 +02:00
Philippe Grand	b7bc34963a	Update paymentsalary.class.php	2018-08-28 10:41:05 +02:00
Philippe Grand	1337d85a29	Update bankcateg.class.php	2018-08-28 10:40:41 +02:00
Philippe GRAND	65af8f902f	Update and standardize code	2018-08-28 09:44:54 +02:00
Frédéric FRANCE	fe4260a014	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-28 09:34:53 +02:00
Frédéric FRANCE	1182f29864	trimtrailing	2018-08-28 08:33:02 +02:00
Laurent Destailleur	7219bac0b2	Merge pull request #9168 from frederic34/trimtrailing ... Trimtrailing	2018-08-28 02:30:02 +02:00
Laurent Destailleur	1842a4bb41	Merge pull request #9278 from grandoc/new_branch_21_08_2018 ... Update and standardize code	2018-08-28 02:13:28 +02:00
Frédéric FRANCE	d8bf4a0ecf	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-25 09:07:04 +02:00
ksar-ksar	a844855ade	Update hook formConfirm ... The hook should be called when the $formconfirm is not empty	2018-08-24 16:40:26 +02:00
Laurent Destailleur	32594e8048	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-24 10:47:10 +02:00
Laurent Destailleur	a82d86cec4	FIX warning for late template invoices to remove when suspended	2018-08-24 10:46:47 +02:00
Philippe GRAND	2fa82edd39	Standardize and update code	2018-08-23 17:07:27 +02:00
Philippe Grand	137b715868	Update deplacementstats.class.php	2018-08-22 22:28:33 +02:00
Philippe GRAND	504b0e3d16	Update and standardize code	2018-08-22 18:34:50 +02:00
Philippe GRAND	6542dcf0bd	Update and standardize code	2018-08-22 12:04:50 +02:00
Philippe GRAND	e0462b975b	Update and standardize code	2018-08-22 11:48:26 +02:00
Philippe GRAND	95349365ba	Update and standardize code	2018-08-22 11:39:37 +02:00
Philippe GRAND	0ffad50974	Update and standardize code	2018-08-22 11:24:31 +02:00
Philippe GRAND	29f15b4ae6	Update and standardize code	2018-08-22 10:51:55 +02:00
Philippe GRAND	a669830427	Update and standardize code	2018-08-22 10:37:16 +02:00
Frédéric FRANCE	6b6daf178f	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-21 20:57:58 +02:00
Frédéric FRANCE	0fbccce9a7	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-21 19:59:07 +02:00
Laurent Destailleur	db3c17668e	Fix coding style	2018-08-21 19:08:11 +02:00
Frédéric FRANCE	aba69b94b2	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-21 14:03:02 +02:00
Laurent Destailleur	0799970804	Merge pull request #9248 from frederic34/FunctionDeclaration ... function declaration	2018-08-21 13:41:56 +02:00
Laurent Destailleur	85eed6cf80	Merge branch 'develop' into trimtrailing	2018-08-21 13:40:04 +02:00
Laurent Destailleur	289f194641	Merge pull request #9058 from defrance/patch-123 ... New : Add total price on dashboard	2018-08-21 13:33:33 +02:00
Laurent Destailleur	5e09d5160f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-21 13:17:20 +02:00
Laurent Destailleur	0f1e5a78c6	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-21 13:17:11 +02:00
Laurent Destailleur	7103bfd7aa	Merge pull request #9253 from frederic34/patch-11 ... Update list.php	2018-08-21 13:11:26 +02:00
Laurent Destailleur	b40e32b8c3	Merge pull request #9264 from grandoc/new_branch_17_08_2018 ... standardize code	2018-08-21 12:52:34 +02:00
Laurent Destailleur	8032c314d4	Merge pull request #9252 from bugness-chl/8.0-2 ... FIX adding GROUP BY for PostgreSQL	2018-08-21 12:51:56 +02:00
Laurent Destailleur	26d34422b0	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-19 03:01:26 +02:00
Laurent Destailleur	116f4a1a09	Fix responsive	2018-08-19 02:22:12 +02:00
Philippe GRAND	c48211ad70	Update and standardize code	2018-08-17 19:31:22 +02:00
Frédéric FRANCE	e63a748a70	Update list.php	2018-08-16 11:59:58 +02:00
Frédéric FRANCE	39462742e2	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-16 08:17:55 +02:00
Chl	9e8485c279	FIX adding GROUP BY for PostgreSQL	2018-08-16 01:14:42 +02:00
Laurent Destailleur	b515511ad6	Merge branch 'develop' into FunctionDeclaration	2018-08-16 00:52:55 +02:00
Laurent Destailleur	5c712a6cd3	Merge branch 'develop' into trimtrailing	2018-08-16 00:47:09 +02:00
Laurent Destailleur	3b245f1b30	Merge pull request #9247 from frederic34/missingReturn ... return comment	2018-08-16 00:35:39 +02:00
Frédéric FRANCE	69a7af88e7	function declaration	2018-08-15 18:14:02 +02:00
Frédéric FRANCE	7bb781eea8	function declaration	2018-08-15 14:28:34 +02:00
Laurent Destailleur	ec56ad752c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php	2018-08-15 14:26:38 +02:00
Frédéric FRANCE	d25fa61998	return comment	2018-08-14 13:14:55 +02:00
Frédéric FRANCE	850ac34020	mark non camelCaps function	2018-08-13 17:26:32 +02:00
Laurent Destailleur	b977c3a9f5	Fix translation	2018-08-13 14:04:10 +02:00
Frédéric FRANCE	82e8efe792	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-12 20:14:14 +02:00
Laurent Destailleur	9fc5d39d07	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-12 20:09:36 +02:00
Laurent Destailleur	dc8c4402ee	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-12 20:09:22 +02:00
Laurent Destailleur	0a1c6e7194	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/comm/propal/list.php htdocs/compta/facture/list.php htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php	2018-08-12 20:08:20 +02:00
Frédéric FRANCE	62db9a4022	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-12 19:54:03 +02:00
Laurent Destailleur	2d571acc03	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/commande/list.php	2018-08-12 19:25:44 +02:00
Laurent Destailleur	30b4d88428	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/compta/facture/list.php htdocs/product/reassort.php htdocs/societe/list.php	2018-08-12 19:23:45 +02:00
Frédéric FRANCE	6f74ecceaf	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-12 18:21:59 +02:00
Laurent Destailleur	2f559a7edb	Merge pull request #9199 from atm-quentin/FIX_hook_update_price ... NEW Add hook changeRoundingMode in update_price	2018-08-12 18:17:52 +02:00
Laurent Destailleur	35c22b231f	Merge pull request #9223 from grandoc/new_branch_08_08_2018 ... Standardize	2018-08-12 18:12:18 +02:00
Laurent Destailleur	12e21b4886	FIX update extrafields	2018-08-12 16:29:26 +02:00
John BOTELLA	681ae88e97	fix display cond	2018-08-10 16:59:22 +02:00
John BOTELLA	6fad0ea5bd	Add retained warranty to pdf	2018-08-10 16:03:39 +02:00
John BOTELLA	d6d8f98f38	add retained warranty cond field and add forms	2018-08-10 15:06:00 +02:00
ATM-Nicolas	d8d54d246c	FIX : Pagination on withdraw request list	2018-08-10 15:05:21 +02:00
Frédéric FRANCE	62b83412ee	test phpcs v3	2018-08-09 11:31:48 +02:00
John BOTELLA	06be98c638	add date field	2018-08-08 17:36:39 +02:00
Philippe GRAND	5b8b4a1415	Standardize	2018-08-08 12:29:36 +02:00
Juanjo Menent	229a5d3532	Merge pull request #9203 from grandoc/new_branch_04_08_2018 ... comment translation	2018-08-08 11:07:18 +02:00
Frédéric FRANCE	9025c452ef	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-07 16:40:03 +02:00
John BOTELLA	3036c94198	Add new situation retained warranty field	2018-08-07 15:18:42 +02:00
Philippe GRAND	948647f3f9	comment translation	2018-08-04 14:17:51 +02:00
atm-quentin	6662bf05ba	FIX hook on update price AND fix id on line	2018-08-03 11:47:43 +02:00
ATM-Nicolas	342a3ef663	NEW : Withdraw request massaction	2018-08-03 09:57:29 +02:00
Laurent Destailleur	e85ec19018	Merge pull request #9093 from atm-gauthier/FIX_filters ... FIX : page must always be 0 when we search	2018-08-02 17:48:35 +02:00
Juanjo Menent	b8efe3b239	Merge pull request #9172 from grandoc/new_branch_28_07_2018 ... standardize	2018-08-02 11:27:02 +02:00
Juanjo Menent	788060aa28	Merge pull request #9178 from aspangaro/9.0_a3 ... NEW : Add project on salaries	2018-08-02 11:19:34 +02:00
Juanjo Menent	37a9a2df56	Merge pull request #9167 from frederic34/include ... Include and co are statements	2018-08-02 11:03:44 +02:00
Alexandre SPANGARO	ee61a88540	Small fix	2018-08-01 07:46:17 +02:00
John BOTELLA	4ddca02bb9	fix situation line's total	2018-07-31 14:58:33 +02:00
Alexandre SPANGARO	0509a176ca	Merge branch 'develop' into 9.0_a3	2018-07-31 07:47:43 +02:00
Alexandre SPANGARO	b0e2e69ed0	New : Add project on salaries	2018-07-31 07:45:03 +02:00
Philippe GRAND	d673848028	standardize	2018-07-30 17:28:44 +02:00
Philippe GRAND	fb565b15c5	standardize	2018-07-29 19:16:28 +02:00
Frédéric FRANCE	c991a4d204	trim trailing	2018-07-26 18:05:20 +02:00
Frédéric FRANCE	a0a5d33641	test include	2018-07-26 17:30:53 +02:00
Philippe GRAND	7d5464cfbc	Clean and update code	2018-07-25 15:25:23 +02:00
Laurent Destailleur	e024ea9c05	Merge pull request #9146 from grandoc/new_branch_24_07_2018 ... Clean and update code	2018-07-24 21:41:12 +02:00
Laurent Destailleur	dc2fec8f57	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-24 19:37:04 +02:00
Philippe GRAND	2a6f050e32	Clean and update code	2018-07-24 18:28:56 +02:00
Laurent Destailleur	ece655a84a	Merge pull request #9128 from atm-john/fix_situation_invoice_status ... Fix situation invoice status	2018-07-24 17:49:53 +02:00
Laurent Destailleur	869a97c8d1	Update card.php	2018-07-24 17:49:10 +02:00
Laurent Destailleur	a469f841f7	Merge pull request #9140 from bugness-chl/8.0-bugfix-pdf ... FIX 2 bugfix for PDF generated by Templates/Cron: DueDate and translation	2018-07-24 17:47:37 +02:00
Laurent Destailleur	bb9c53b41f	Merge pull request #9118 from bugness-chl/8.0 ... corr. "group by" for PostgreSQL	2018-07-24 17:43:36 +02:00
Chl	0f115dafee	2 bugfix for PDF generated by Templates/Cron: DueDate and translation ... When launching Cron on a facturerec with auto_validate at 1, the generated PDF doesn't contain the DueDate, and some tokens like __INVOICE_PREVIOUS_MONTH_TEXT__ in the public notes are not translated (tested with fr_FR).	2018-07-24 00:39:21 +02:00
Laurent Destailleur	2c7029850a	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/website.lib.php htdocs/website/index.php	2018-07-21 20:28:26 +02:00
John BOTELLA	0c01f6e139	Fix situation invoice status	2018-07-20 15:53:32 +02:00
Laurent Destailleur	5523312f87	Fix missing email	2018-07-18 15:36:07 +02:00
Laurent Destailleur	38de5a8f2a	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-18 14:25:19 +02:00
Laurent Destailleur	bef777e19d	Fix default order for bank entry list	2018-07-18 14:24:58 +02:00
Chl	b306394c15	corr. group by pour PostgreSQL	2018-07-17 23:57:21 +02:00
Laurent Destailleur	f60e04dcb4	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-17 22:33:36 +02:00
Laurent Destailleur	cecb0f8829	Fix missing lib	2018-07-17 22:33:20 +02:00
Laurent Destailleur	4b044779dc	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-17 22:31:58 +02:00
Laurent Destailleur	969aea98e1	Fix label of copy must not be same	2018-07-17 22:31:28 +02:00
Laurent Destailleur	47cb1f920e	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-17 21:43:08 +02:00
Laurent Destailleur	7662f8f25c	Fix balance	2018-07-17 21:39:41 +02:00
Laurent Destailleur	c68b9493e5	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-17 21:21:20 +02:00
Laurent Destailleur	a7853211d6	Fix balance when sorting of value date desc	2018-07-17 21:20:38 +02:00
Laurent Destailleur	34c2facff1	Fix missing link on bank account	2018-07-17 18:16:30 +02:00
Laurent Destailleur	387abf2da8	Merge pull request #9057 from inoveaconseil/checkRightOnLink ... ADD Check right on link	2018-07-16 09:31:21 +02:00
Laurent Destailleur	e4be3ab954	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-13 09:09:51 +02:00
Laurent Destailleur	1b33703cd8	Fix missing country code	2018-07-13 09:08:42 +02:00
gauthier	80ff7fa86f	FIX : case when we valid form with keyboard	2018-07-11 15:18:30 +02:00
gauthier	103c7e6d06	FIX : page must always be 0 when we search (to avoid case : when we're on page 3 and we're looking for a precise thirdparty, we stay on page 3 and nothing's displaied)	2018-07-11 09:51:36 +02:00
Laurent Destailleur	45d1a14c8e	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-06 16:10:37 +02:00
Laurent Destailleur	ed6ec8138d	Fix filter on invoice status	2018-07-06 16:06:15 +02:00
Laurent Destailleur	fb84211714	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-06 12:45:44 +02:00
Laurent Destailleur	6c5264fabb	Fix label	2018-07-06 12:45:20 +02:00
Inovea Conseil	7f137adef9	ADD check user's rights	2018-07-06 08:07:38 +02:00
delcroix Patrick	5f7a308552	Merge branch 'develop' into comptafiles	2018-07-05 22:35:40 +02:00
patrick Delcroix	a90974378e	FIX: credit / debit	2018-07-05 22:31:29 +02:00
patrick Delcroix	0e7ba92784	New: Accounting dossier file checks page ... Page to check to attachement of those operation invoice, invoicesupplier, salary, donation, Expense, tax	2018-07-05 21:34:36 +02:00
Inovea Conseil	5011f252c1	ADD check user's rights	2018-07-05 19:00:41 +02:00
BENKE Charlene	c169ff4b97	Update facture.class.php	2018-07-05 12:01:48 +02:00
Inovea Conseil	30cff2bb36	ADD check user's rights	2018-07-05 11:52:41 +02:00
Laurent Destailleur	12c43d7722	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-03 12:33:17 +02:00
Laurent Destailleur	3c176adb38	Fix more complete fix for bad label in creating invoice from other obj	2018-07-02 16:46:30 +02:00
Laurent Destailleur	cae7cabe6d	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-07-02 16:22:55 +02:00
Laurent Destailleur	b22754c60b	FIX label of source object	2018-07-02 16:22:40 +02:00
Laurent Destailleur	4e7f9b1b4d	Merge pull request #9038 from hregis/8.0_multicompany ... Fix: possibility to overload permissions (multicompany sharing)	2018-07-02 16:12:40 +02:00
Laurent Destailleur	63f3143718	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-02 12:18:34 +02:00
Laurent Destailleur	7bf33b1bac	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/hrm/index.php htdocs/install/mysql/tables/llx_website_account.key.sql htdocs/modulebuilder/template/myobject_card.php	2018-07-02 12:16:51 +02:00
Laurent Destailleur	11021353da	Fix text in payment area of crabe pdf	2018-07-02 11:33:33 +02:00
Regis Houssin	26495fb698	Fix: !!!! Dont't use entity if you use rowid in fetch or others !!!!	2018-07-01 18:49:37 +02:00
Laurent Destailleur	982a1ffbaf	NEW Automatic position of scroll when creating an extrafield	2018-06-30 14:22:05 +02:00
Laurent Destailleur	1ff8788ff7	Merge pull request #9016 from yolocodefrench/develop ... ajout de la gestion des comptes bancaires des tiers via l'api	2018-06-30 01:26:08 +02:00
Laurent Destailleur	da138db528	FIX combo into popup become crazy with IE10 ... Conflicts: htdocs/asset/card.php htdocs/modulebuilder/template/myobject_card.php	2018-06-28 12:16:12 +02:00
Laurent Destailleur	3ea2d81279	FIX combo into popup become crazy with IE10	2018-06-28 12:05:02 +02:00
STAGIAIRE-PC\Pierre	a94eeaa500	adding the possibility to personnalize ent_to_end and ustrd of a bank levy	2018-06-27 10:53:45 +02:00
Laurent Destailleur	969b272576	Rename menu entries and report title for better understanding	2018-06-26 11:18:31 +02:00
Laurent Destailleur	5c93fa1bfb	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/admin/journals_list.php htdocs/compta/facture/fiche-rec.php htdocs/core/class/html.form.class.php htdocs/filefunc.inc.php htdocs/langs/fr_FR/other.lang	2018-06-26 01:25:03 +02:00
Laurent Destailleur	7f8570f720	Fix lang loading	2018-06-26 00:48:43 +02:00
Laurent Destailleur	af9d2c3b5a	Merge pull request #9008 from grandoc/new_branch_22_06_2018 ... clean and update code	2018-06-24 13:47:26 +02:00
Laurent Destailleur	0170906524	Look and feel	2018-06-23 14:39:24 +02:00
Laurent Destailleur	7daee6dc6b	A lot of fix of css and look and feel v8	2018-06-23 00:07:56 +02:00
Laurent Destailleur	27a27e02a1	Fix css	2018-06-22 22:53:53 +02:00
Philippe GRAND	afda5288a8	clean and update code	2018-06-22 16:27:11 +02:00
Laurent Destailleur	5bee324578	Update paiement.class.php	2018-06-22 14:34:59 +02:00
Laurent Destailleur	d81398e72d	Fix info on tooltip	2018-06-18 16:27:25 +02:00
Laurent Destailleur	ad2df304b4	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/customer/lines.php htdocs/fourn/commande/card.php htdocs/societe/class/societe.class.php	2018-06-18 13:31:29 +02:00
Laurent Destailleur	95ee3325fc	Part of fix of #8972	2018-06-18 11:11:07 +02:00
Philippe GRAND	4c08e2ebf3	clean and update code	2018-06-17 14:33:29 +02:00
Laurent Destailleur	7c7ee56832	Fix missing email ... Fix avoid warning	2018-06-17 01:50:10 +02:00
Ferran Marcet	a21e138c70	Fix: Avoid converting into reduction twice and draft invoice	2018-06-15 11:19:04 +02:00
Laurent Destailleur	9717a32a2e	Merge pull request #8960 from grandoc/new_branch_13_06_2018 ... clean code	2018-06-14 12:01:19 +02:00
Laurent Destailleur	910652eb6d	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/fourn/commande/card.php htdocs/langs/en_US/admin.lang	2018-06-13 23:07:30 +02:00
Laurent Destailleur	4c2af6fc70	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/core/class/html.form.class.php	2018-06-13 23:04:08 +02:00
Laurent Destailleur	4a5fd35e11	Look and feel v8	2018-06-13 22:57:41 +02:00
Philippe GRAND	a937d9e657	clean code	2018-06-13 22:52:24 +02:00
Laurent Destailleur	c586f2ecf7	Merge pull request #8957 from altatof/FIX_TOTAL_HT_DEVISE ... FIX : pu_ht_devise was not converted to numeric so decimals were lost when calculating total_ht_devise	2018-06-13 21:20:42 +02:00
Laurent Destailleur	3703a7c4b0	Merge pull request #8952 from papoteur-mga/patch-1 ... Fix: In list of bank accounts, display the balance in formatted price	2018-06-13 20:40:27 +02:00
altatof	d42f00bca9	FIX : pu_ht_devise was not converted to numeric so decimals were lost ... when clculating total_ht_devise	2018-06-13 16:35:52 +02:00
Papoteur	6567365086	In list of bank accounts, display the balance in formatted price ... [Problem to solve] in compta/bank/list.php, the balance can be displayed witht decimal or not. This is not fine. [Solution] Change a parameter in the price function to format the balance with the required number of decimals.	2018-06-13 08:39:26 +02:00
Marc de Lima Lucio	e992187f4c	FIX: handle sortorder on multiple columns + potential SQL field mismatch	2018-06-12 16:00:16 +02:00
Regis Houssin	7ce2ebf1a9	Fix: wrong var name	2018-06-07 16:25:47 +02:00
Laurent Destailleur	a7b38db31f	Fix bug reported by scrutinizer	2018-06-06 18:55:50 +02:00
Laurent Destailleur	b57f3a3f36	Fix bug reported by scrutinizer	2018-06-06 18:41:35 +02:00
Laurent Destailleur	6b24d81afc	Fix bug reported by scrutinizer	2018-06-06 18:40:56 +02:00
Laurent Destailleur	a8e06abc4f	Fix bug reported by scrutinizer	2018-06-06 18:35:11 +02:00
gauthier	77e7932671	FIX : sometimes amounts are identical but php find them different.	2018-06-05 11:33:58 +02:00
Laurent Destailleur	40ab046bd1	Merge pull request #8904 from Mavyre/develop ... FIX Errors on synchronize rates when accessing Dolibarr from HTTPS	2018-06-04 13:46:03 +02:00
Laurent Destailleur	7c0afbe025	Clean code	2018-05-31 17:12:08 +02:00
Mavyre	6b86e1c3bb	FIX Bookkeeping report wrong display	2018-05-30 21:38:57 +02:00
Laurent Destailleur	d8d4d15b4b	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-05-30 12:13:40 +02:00
Laurent Destailleur	de59892438	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/functions.lib.php htdocs/fourn/class/fournisseur.commande.class.php	2018-05-30 12:13:18 +02:00
Laurent Destailleur	c1f5c6becf	Merge pull request #8877 from frederic34/longlines ... soft limit length of lines to 500 chars	2018-05-30 11:19:29 +02:00
Laurent Destailleur	3733169120	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/compta/recap-compta.php htdocs/fourn/class/fournisseur.commande.class.php	2018-05-30 11:09:53 +02:00
florian HENRY	b65b545e0f	add hook on balence pages	2018-05-29 16:29:14 +02:00
Laurent Destailleur	4d60fb3468	Fix size of popup	2018-05-29 10:57:14 +02:00
Laurent Destailleur	323bf6ef1f	Merge pull request #8873 from frederic34/loadlangs ... loadlangs	2018-05-29 10:07:10 +02:00
Laurent Destailleur	f83dedf1b0	Fix space/tab	2018-05-29 10:04:20 +02:00
Neil Orley	748be12da2	Get external contacts ids instead of BILLING contacts ids.	2018-05-28 09:42:24 +02:00
Neil Orley	4ad1f81ea9	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop	2018-05-28 09:30:21 +02:00
Laurent Destailleur	5da89e1cad	Remove log	2018-05-27 19:33:46 +02:00
Laurent Destailleur	f3f252e88b	Fix duplicate record before creating primary key	2018-05-27 19:31:03 +02:00
Frédéric FRANCE	5c8f966898	Merge remote-tracking branch 'upstream/develop' into loadlangs	2018-05-27 18:41:17 +02:00
Laurent Destailleur	3f489ee3c6	Fix look and feel v7 for popup on ref of social contributions payments	2018-05-27 17:58:32 +02:00
Frédéric FRANCE	e2a557aadd	limit length of lines to 500 chars	2018-05-27 15:04:12 +02:00
Frédéric FRANCE	84f2b31d46	loadlangs	2018-05-27 09:40:17 +02:00
Frédéric FRANCE	4d5c28b597	loadlangs	2018-05-27 09:27:09 +02:00
Frédéric FRANCE	812b182680	loadlangs	2018-05-26 17:04:23 +02:00
Frédéric FRANCE	9cd7bb3f58	loadlangs	2018-05-26 16:03:19 +02:00
Frédéric FRANCE	cbed5c8349	loadlangs	2018-05-26 15:41:32 +02:00
Laurent Destailleur	182abfdb5b	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/propal/list.php htdocs/commande/list.php htdocs/societe/card.php	2018-05-25 15:02:24 +02:00
Laurent Destailleur	8a64ee2297	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/commande/list.php htdocs/compta/facture/card.php htdocs/compta/facture/list.php htdocs/expedition/class/expedition.class.php htdocs/expedition/list.php htdocs/societe/card.php	2018-05-25 13:14:58 +02:00
Laurent Destailleur	823936ef87	Merge pull request #8847 from frederic34/multipriceqty ... NEW Finish implementation of option PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES	2018-05-25 12:55:02 +02:00
Laurent Destailleur	b25c7e44d3	Merge pull request #8816 from atm-gauthier/6.0_fix_test_before_delete_invoice ... FIX : test is_erasable() must be done before call function delete()	2018-05-25 11:05:20 +02:00
Laurent Destailleur	0a581e48d4	Update card.php	2018-05-25 11:04:04 +02:00
Laurent Destailleur	205732e240	Merge pull request #8822 from aspangaro/8.0-b27 ... Salaries : Move to LoadLangs	2018-05-25 10:34:36 +02:00
atm-quentin	eb224e43a5	FIX missing filters during ordering	2018-05-24 10:41:24 +02:00
Frédéric FRANCE	8547827575	Merge remote-tracking branch 'upstream/develop' into multipriceqty	2018-05-23 17:06:02 +02:00
Frédéric FRANCE	efbb053e54	PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES	2018-05-23 17:05:08 +02:00
Laurent Destailleur	a1c799507a	Fix $contactobject not always defined	2018-05-23 08:16:24 +02:00
Laurent Destailleur	d072c2eb5d	Fix turnover invoiced by vat rate and country. Use fiscal month start.	2018-05-22 23:09:27 +02:00
Neil Orley	15e02c7082	NEW : adds billing contacts ids to REST API returns ... adds billing contacts ids to REST API returns for proposals, orders and invoices	2018-05-22 11:40:32 +02:00
Laurent Destailleur	745aa4bd73	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-05-21 23:38:46 +02:00
Laurent Destailleur	8951c4a7a5	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-05-21 23:36:47 +02:00
Laurent Destailleur	de84f0e687	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/core/actions_massactions.inc.php htdocs/filefunc.inc.php	2018-05-21 23:35:09 +02:00
Alexandre SPANGARO	3fd55585b7	Salaries : Move to LoadLangs	2018-05-20 08:00:42 +02:00
gauthier	4c3f9d6d5e	FIX : test is_erasable() must be done before call function delete() too to avoid delete invoice with &action=delete in url	2018-05-18 15:20:16 +02:00
Laurent Destailleur	24281028b7	Merge pull request #8807 from inoveaconseil/patch-2 ... Fix missing params for commonGenerateDocument	2018-05-18 11:43:11 +02:00
Laurent Destailleur	e724cfd6a2	Merge pull request #8802 from atm-john/new_avoir_situation ... Add credit note compatibility with situation invoice.	2018-05-18 11:34:10 +02:00
Laurent Destailleur	e2369dea29	FIX #8722	2018-05-18 11:17:21 +02:00
Laurent Destailleur	dd53f414f8	Merge pull request #8788 from bugness-chl/develop ... Fix #8722 useless sql ORDER BY	2018-05-18 11:16:08 +02:00
John	3dd11e1eaf	Fix discount id	2018-05-18 11:02:04 +02:00
Laurent Destailleur	689ef37d56	Merge pull request #8781 from atm-john/extend_import_lines_from_linked_element ... Add propals lines inport on invoices.	2018-05-18 08:55:29 +02:00
Inovea Conseil	5804d1d4a3	Fix missing params for commonGenerateDocument ... ADD param moreparams for compatibility with commonGenerateDocument	2018-05-17 10:16:44 +02:00
John	8175d90816	change case	2018-05-17 09:01:49 +02:00
Laurent Destailleur	ac97ba9e36	Fix deletion of stripe card ... Solve validation of recurring invoice	2018-05-16 20:41:01 +02:00
John	fddd3156b1	add hidden conf	2018-05-16 16:15:30 +02:00
John	c67ab2a758	add hidden conf	2018-05-16 16:14:49 +02:00
John	4a0195deee	Fix merge mistake	2018-05-16 15:55:56 +02:00
John	f773317bf5	remove comment and move table	2018-05-16 15:55:42 +02:00
John	b01893d536	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation_pull	2018-05-16 15:29:57 +02:00
Laurent Destailleur	ef395fc36b	Fix scrutinizer bugs	2018-05-16 15:23:52 +02:00
John	05bb98f4c0	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_invoice_default_documents	2018-05-16 11:49:37 +02:00
Laurent Destailleur	3e27d7dd2a	Report of turnover by vat rate / product type / country	2018-05-15 17:51:19 +02:00
Laurent Destailleur	7099068f05	Fix calculation of vat paid	2018-05-15 14:47:04 +02:00
John	b42c87256c	Fix_situation_discount_used	2018-05-14 14:55:33 +02:00
Chl	9b2f62791b	Fix #8722 useless sql ORDER BY	2018-05-13 15:52:47 +02:00
atm-john	6b2dfa0528	Extend lines import to propal	2018-05-10 21:06:18 +02:00
Laurent Destailleur	4efc9f95cd	FIX #8775 (try better fix)	2018-05-10 11:48:18 +02:00
atm-quentin	8cd6c72a2f	NEW advanced rights	2018-05-07 10:04:43 +02:00
Laurent Destailleur	546da0ceda	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/admin/account.php htdocs/core/modules/modStock.class.php htdocs/product/inventory/list.php	2018-05-05 14:40:39 +02:00
Laurent Destailleur	97f161b276	Update list.php	2018-05-05 14:25:44 +02:00
Abbes Bahfir	17b8de2cdd	New : Option INVOICE_CAN_REMOVE_DRAFT_ONLY to delete draft invoices with precedence over INVOICE_CAN_ALWAYS_BE_REMOVED	2018-05-05 12:57:29 +01:00
atm-quentin	ec5e84075e	NEW Rights to ignore price min	2018-05-03 10:18:38 +02:00
atm-quentin	21b387a4c4	NEW thirdparty categ filter on lists	2018-05-02 15:01:32 +02:00
Laurent Destailleur	3340598cf8	FIX Projet is not prefilled when created from overwiew page	2018-05-01 14:15:11 +02:00
Laurent Destailleur	3374c50e2d	CSS	2018-05-01 10:42:09 +02:00
Laurent Destailleur	b9e6f6eab8	Fix link to navigate in year only if filter is for a full year	2018-05-01 10:35:12 +02:00
Laurent Destailleur	ee69bdd3da	Merge pull request #8699 from DazzX/improve_stat_page ... New : Reactivate next and previous link	2018-05-01 10:26:49 +02:00
Laurent Destailleur	de0721aba9	Merge pull request #8698 from DazzX/result_stat_refresh_link ... Fix bug when click on refresh button	2018-05-01 10:22:07 +02:00
Laurent Destailleur	05d1613628	Merge pull request #8697 from DazzX/turnover_stat_refresh_link ... Fix link "refresh" on turnover report	2018-05-01 10:20:04 +02:00
Laurent Destailleur	9eea58e4c5	Translation	2018-04-30 20:19:28 +02:00
Laurent Destailleur	c9cca57b0f	NEW monthly VAT report show "Claimed for the period" + "Paid during this ... period"	2018-04-30 20:02:16 +02:00
Laurent Destailleur	1bf56e58b3	Work on vat report	2018-04-30 18:21:04 +02:00
Julien BARRET	bb2ef46ef4	Reactivate next and previous link	2018-04-30 00:24:47 +02:00
Julien BARRET	b099d834a0	Fix bug : when click on refresh button, next and previous button are broken. ... Eg. in year 2018, next button point to year 4032!	2018-04-29 23:26:44 +02:00
Julien BARRET	efcc3f40fa	Fix link "refresh" on turnover report	2018-04-29 23:22:46 +02:00
Laurent Destailleur	2fc2c44de4	Fix phpcs	2018-04-29 20:18:50 +02:00
Laurent Destailleur	82a8513aed	Standardize code	2018-04-29 19:52:14 +02:00
Laurent Destailleur	aafab12f4b	Debug API for ticket module	2018-04-29 18:06:31 +02:00
Laurent Destailleur	1a9476bff5	Fix edition of label of a vat payment.	2018-04-28 20:17:39 +02:00
Laurent Destailleur	e72c2e6a11	Enhance sorting of field for lists on field with several sort criterias	2018-04-28 19:54:41 +02:00
Laurent Destailleur	2241418b33	Fix look and feel v7	2018-04-28 18:43:29 +02:00
Laurent Destailleur	e8fd5ea5cd	Better translation	2018-04-28 17:18:38 +02:00
Laurent Destailleur	94d6e178f7	Work on vat report code rewrite	2018-04-28 16:06:46 +02:00
Laurent Destailleur	257dc1cf77	Work on rewriting VAT reports	2018-04-27 19:17:34 +02:00
Laurent Destailleur	c50700470b	Remove deprecated file	2018-04-27 12:51:39 +02:00
Laurent Destailleur	e3142fff39	NEW Add method to register distributed payments on invoices	2018-04-27 11:38:31 +02:00
Laurent Destailleur	469d909126	Revert "Revert "NEW : Adds a contact to an invoice with REST API""	2018-04-27 10:46:09 +02:00
Laurent Destailleur	df9f4d3193	Revert "NEW : Adds a contact to an invoice with REST API"	2018-04-27 10:40:27 +02:00
Laurent Destailleur	fb582c2444	Merge pull request #8682 from Oeris/develop ... NEW : Adds a contact to an invoice with REST API	2018-04-27 10:37:04 +02:00
Laurent Destailleur	db8ddc4712	Merge pull request #8680 from ATM-Nicolas/new_paymentsocial_trigger ... NEW : Call to trigger on payment social contribution creation	2018-04-27 10:32:34 +02:00
Laurent Destailleur	3af67d4b92	Merge pull request #8679 from ATM-Nicolas/fix_wrong_trigger_name ... FIX : Wrong trigger name	2018-04-27 10:32:17 +02:00
Laurent Destailleur	c40b50ca71	Fix typo	2018-04-27 10:23:09 +02:00
Laurent Destailleur	489318d4db	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-27 10:18:40 +02:00
Laurent Destailleur	aa30b946b6	Fix from #8677	2018-04-27 10:18:22 +02:00
Laurent Destailleur	27997b8c11	Merge pull request #8675 from ATM-Nicolas/fix_link_credit_note ... Fix link credit note	2018-04-27 10:12:31 +02:00
Laurent Destailleur	3301c99b75	Merge pull request #8664 from DazzX/turnover_stat ... Fix Year selector issue in turnover statistics page	2018-04-27 09:40:50 +02:00
Neil Orley	00fb4300fc	FIX : return type change from array to int	2018-04-26 12:03:55 +02:00
Neil Orley	bf3b99163d	NEW : Adds a payment for the list of invoices given as parameter ... Adds a payment for the list of invoices given as parameter ie : 1 payment for x invoice	2018-04-26 11:59:59 +02:00
Neil Orley	991d5c4215	NEW : Adds a contact to an invoice ... Adds a contact to an invoice using the REST API	2018-04-25 16:04:21 +02:00
ATM-Nicolas	f71755d454	NEW : Call to trigger on payment social contribution creation	2018-04-25 09:34:57 +02:00
ATM-Nicolas	e058ab40a0	FIX : Wrong trigger name	2018-04-25 09:24:22 +02:00
Laurent Destailleur	5d01efb79d	Code comment	2018-04-24 20:27:02 +02:00
ATM-Nicolas	b272d766a9	Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_link_credit_note	2018-04-24 11:48:49 +02:00
ATM-Nicolas	64dde1595b	FIX : Credit note links set from source invoice links	2018-04-24 11:48:26 +02:00
Laurent Destailleur	461ae46cc4	FIX When on a high page and searching for a small result, list was not ... visible.	2018-04-24 11:37:57 +02:00
Julien BARRET	8256bd1889	Fix Year selector issue in turnover statistics page	2018-04-23 11:39:34 +02:00
Laurent Destailleur	32511422ab	Fix PSR2	2018-04-22 20:08:29 +02:00
Laurent Destailleur	ac89951acd	Merge pull request #8647 from fmarcet/develop ... New: Add same parameters on 'printFieldListTitle' hooks	2018-04-22 19:35:09 +02:00
Laurent Destailleur	69adf73f4f	Clean code from $var = True	2018-04-22 19:27:37 +02:00
Laurent Destailleur	fec9303d18	Remove useless $var	2018-04-22 18:51:03 +02:00
Laurent Destailleur	912d5c53f2	Standardize code	2018-04-21 15:54:05 +02:00
Laurent Destailleur	c81c744aaf	Clean deprecated var	2018-04-21 13:14:58 +02:00
Laurent Destailleur	ccd9aa8059	Fight against dolibarr warnings	2018-04-21 12:16:12 +02:00
Laurent Destailleur	cef9782179	Clean defined constant at begin of pages	2018-04-21 12:00:55 +02:00
Laurent Destailleur	1031fcd796	logs	2018-04-21 00:37:05 +02:00
Ferran Marcet	6ced1a3264	New: Add same parameters on 'printFieldListTitle' hooks	2018-04-20 10:38:16 +02:00
Laurent Destailleur	bbfc4a3e17	NEW Look and feel v8 - Show Picto "+" on all links "Add record"	2018-04-18 03:26:15 +02:00
Laurent Destailleur	faea6861c3	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/invoicetemplate_list.php htdocs/langs/en_US/bills.lang	2018-04-16 18:19:21 +02:00
Laurent Destailleur	622042e9b2	FIX Max nb of generation of recurring invoice should not show warning	2018-04-16 15:05:35 +02:00
Laurent Destailleur	f1ad3912e7	Fix multicompany compatibility for recurring invoice generation	2018-04-16 14:18:38 +02:00
Laurent Destailleur	0d0da234b1	Lowercase NULL, TRUE, FALSE according to PSR2	2018-04-16 13:51:16 +02:00
Laurent Destailleur	69c26e19a8	NEW Can edit the text color for title line of tables	2018-04-15 22:01:52 +02:00
Laurent Destailleur	8fbde88872	Look and feel v8	2018-04-15 17:37:49 +02:00
Laurent Destailleur	187cc35786	Look and feel v8	2018-04-14 22:23:56 +02:00
Laurent Destailleur	374a0723bf	Fix VAT report by rate	2018-04-13 22:20:14 +02:00
Laurent Destailleur	6f91b8019f	Remove warnings	2018-04-13 17:54:27 +02:00
Laurent Destailleur	be965bdbab	Clean code	2018-04-13 13:28:48 +02:00
Laurent Destailleur	1521b0595b	Clean code	2018-04-13 11:03:03 +02:00
Laurent Destailleur	6e288fca75	Merge pull request #8575 from all3kcis/develop-patch-16 ... NEW Add files management on products lot	2018-04-13 00:57:13 +02:00
Laurent Destailleur	3078b890d4	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/stripe/admin/stripe.php	2018-04-13 00:45:39 +02:00
Laurent Destailleur	421a794942	FIX #8559 Bug to generate cheque receipt	2018-04-12 17:22:51 +02:00
All-3kcis	880fa55dd5	display user-friendly filesize	2018-04-12 15:29:22 +02:00
Laurent Destailleur	ea2fd67e0d	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/bank/card.php htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php htdocs/core/tpl/admin_extrafields_view.tpl.php htdocs/langs/de_DE/admin.lang	2018-04-12 13:31:14 +02:00
Laurent Destailleur	590bc2948a	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/compta/bank/card.php htdocs/core/tpl/admin_extrafields_view.tpl.php	2018-04-11 17:20:49 +02:00
Laurent Destailleur	628b437e28	Update card.php	2018-04-11 16:25:05 +02:00
Laurent Destailleur	9af052602a	Fix css	2018-04-11 12:54:57 +02:00
atm-arnaud	848d76ee78	FIX #8023	2018-04-10 14:43:32 +02:00
Laurent Destailleur	7108f68db9	Remove old deprecated hook insertExtraFields. Triggers must be used for ... action on CRUD events.	2018-04-10 12:03:01 +02:00
John	24bf8cb162	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_invoice_default_documents	2018-04-09 16:21:37 +02:00
Laurent Destailleur	fae509e41d	Clean code	2018-04-09 14:25:15 +02:00
Laurent Destailleur	54a86dc2b1	Fix CSS	2018-04-09 11:42:43 +02:00
Laurent Destailleur	0475cb8018	FIX Permission for bookkeeper	2018-04-09 10:51:58 +02:00
John	63180f45a8	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation	2018-04-09 09:17:26 +02:00
Laurent Destailleur	0c0f950338	Look and feel	2018-04-09 00:03:13 +02:00
Laurent Destailleur	cfa667f9df	Fix rounding in data shown	2018-04-09 00:01:15 +02:00
Laurent Destailleur	99ed9c4589	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/bookkeeping/card.php htdocs/compta/facture/list.php	2018-04-08 13:10:10 +02:00
Laurent Destailleur	79af10fc83	Fix search filters	2018-04-08 13:01:42 +02:00
Laurent Destailleur	165ee9598a	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/bank/bankentries_list.php	2018-04-07 21:52:51 +02:00
Laurent Destailleur	304adff973	FIX view of balance before field ... Conflicts: htdocs/compta/bank/bankentries_list.php	2018-04-07 21:49:59 +02:00
Laurent Destailleur	893adae346	FIX view of balance before field	2018-04-07 21:45:06 +02:00
Laurent Destailleur	989d1c87c6	Fix link to reconcile	2018-04-07 20:06:19 +02:00
Laurent Destailleur	bacee3c298	Translation	2018-04-07 20:06:14 +02:00
Laurent Destailleur	88890cf9f4	Fix link to reconcile	2018-04-07 20:03:59 +02:00
Laurent Destailleur	b801a465f5	Translation	2018-04-07 19:42:47 +02:00
Laurent Destailleur	4d2d9193b9	Work on VAT reports to use option MAIN_INFO_VAT_RETURN	2018-04-07 15:47:13 +02:00
Laurent Destailleur	d46a8eb8f0	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/company.php	2018-04-07 12:30:30 +02:00
Laurent Destailleur	15c7bbf9d8	Fix input lost when error	2018-04-07 12:28:10 +02:00
Laurent Destailleur	e7d69b18bd	Merge pull request #8504 from ATM-Nicolas/develop ... NEW : Add link between credit note invoice and origin	2018-04-06 09:15:02 +02:00
TuxGasy	47dcc0d5c6	fix notrigger ignored on BILL_CREATE	2018-04-05 18:32:41 +02:00
Laurent Destailleur	9892a97424	Merge pull request #8509 from tuxgasy/5.0_notrigger_BILL_CREATE ... fix notrigger ignored on BILL_CREATE	2018-04-05 18:27:45 +02:00
Laurent Destailleur	2d547abaa9	Merge pull request #8498 from atm-john/New_import_lines_from_linked_element ... New import lines from linked element	2018-04-05 18:26:47 +02:00
John	b02f34b038	Add line edit progress test	2018-04-05 17:13:45 +02:00
Laurent Destailleur	9d9f3ddf85	Merge pull request #8502 from ATM-Marc/NEW_create_from_list ... NEW: generalize use of button to create new element from list	2018-04-05 16:40:15 +02:00
John	689b3e3b64	Fix outing invoice ligne progress	2018-04-05 11:25:11 +02:00
John	b37a2f17bf	Fix credit note update on remove from cycle action	2018-04-05 10:48:20 +02:00
John	e966d11356	Fix credit note card apparence	2018-04-05 09:46:55 +02:00
TuxGasy	e5664f9630	fix notrigger ignored on BILL_CREATE	2018-04-04 20:32:36 +02:00
John	ce24ca08ee	move list of situation table and fix credit note display	2018-04-04 12:33:48 +02:00
ATM-Nicolas	b9a91c667f	NEW : Add link between credit note invoice and origin	2018-04-04 09:33:59 +02:00
John	299859d0c4	add action to remove from cycle	2018-04-03 17:34:20 +02:00
John	70321a8b71	add button to remove from cycle	2018-04-03 15:12:44 +02:00
John	b7681e7249	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation	2018-04-03 14:12:49 +02:00
John	d689e88b92	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element	2018-04-03 11:38:12 +02:00
John	227e4ef9a6	fix php compatibility	2018-04-03 10:50:15 +02:00
Laurent Destailleur	2d3a55a6a8	Restore broken confirmation popup	2018-03-31 23:39:08 +02:00
Laurent Destailleur	927d86f27f	Revert "NEW: formconfirm in javascript" ... This reverts commit 50790d5527.	2018-03-31 23:10:12 +02:00
Laurent Destailleur	d21143831c	Clean code	2018-03-31 22:44:32 +02:00
Laurent Destailleur	43f8834b28	Uniformize code with the new module builder framework	2018-03-31 18:48:27 +02:00
Marc de Lima Lucio	0366e645d5	NEW: generalize button to create object from list, for most of the lists	2018-03-30 16:54:38 +02:00
Laurent Destailleur	7c394733e4	Merge pull request #8445 from ATM-Consulting/develop_atm ... NEW: bank reconcile: checkbox to select all bank operations	2018-03-29 14:49:41 +02:00
Laurent Destailleur	f2022241e3	Merge pull request #8466 from aspangaro/8.0-a11 ... Add label project in tooltip in customer/supplier list	2018-03-29 13:44:13 +02:00
Laurent Destailleur	1c86eb1c44	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/localtax/index.php htdocs/compta/tva/quarter_report.php htdocs/core/lib/tax.lib.php	2018-03-29 03:08:01 +02:00
Alexandre SPANGARO	c012c330de	Merge remote-tracking branch 'uptream/develop' into 8.0-a11	2018-03-27 21:45:35 +02:00
Alexandre SPANGARO	6e27da605a	Add label project in tooltip in customer/supplier list	2018-03-27 21:41:25 +02:00
Laurent Destailleur	34fae0bd48	Merge pull request #8456 from atm-greg/Fix_bankentries_list ... FIX sql error using no category	2018-03-27 17:49:01 +02:00
Laurent Destailleur	51cd793d80	Fix log and duplicate vat_by_date function	2018-03-27 14:37:29 +02:00
Laurent Destailleur	f9ee2930e2	FIX Data on income/expense report was always 0	2018-03-27 14:16:59 +02:00
Laurent Destailleur	0b13cd17ac	FIX Some report have data when several chart of accounts exists ... FIX Detail per account not visible when total < 0	2018-03-27 13:55:10 +02:00
Laurent Destailleur	2b588b9e43	FIX Initial month on report income/expense per predefined group	2018-03-27 13:37:40 +02:00
Laurent Destailleur	d1e9a4719b	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/customer/index.php htdocs/accountancy/expensereport/index.php htdocs/accountancy/supplier/index.php	2018-03-27 12:27:15 +02:00
atm-greg	91d6a1b621	fix sql error using no category	2018-03-27 06:40:12 +02:00
Laurent Destailleur	b44e791c0a	Work on vat reports	2018-03-26 21:39:18 +02:00
Laurent Destailleur	89bf781fe6	FIX Add warning when expense report line not into range ... FIX Name of user not visible on journalizing expense report payments FIX Only approved expense report must be journalized	2018-03-26 14:13:40 +02:00
Laurent Destailleur	c7e93a5a3b	Serious enhancement in auto subscription for member module	2018-03-23 22:49:08 +01:00
John	88fab15c60	Change situation display	2018-03-23 17:12:09 +01:00
Marc de Lima Lucio	50790d5527	NEW: formconfirm in javascript	2018-03-23 16:54:33 +01:00
John	6a676ea49e	fix percent	2018-03-23 12:24:47 +01:00
Marc de Lima Lucio	5c46d62acd	NEW: bank reconcile: checkbox to select all bank operations	2018-03-23 11:04:11 +01:00
Laurent Destailleur	171ad5dce2	Enhance code for template invoices	2018-03-22 21:42:19 +01:00
Laurent Destailleur	9980a5fbd0	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog	2018-03-22 14:08:43 +01:00
John	b4983d0e6d	FIX invoice filter	2018-03-22 11:37:16 +01:00
John	fd86e90df2	Add create creadit note btn	2018-03-22 11:19:39 +01:00
Laurent Destailleur	227b830aa2	Fix visible rounding of abandonned amount	2018-03-22 09:41:30 +01:00
John	f91fe41f45	prepare invoice selection and calculation	2018-03-19 15:50:56 +01:00
Laurent Destailleur	12068f9cf3	Merge branch 'develop' into 8.0-a7	2018-03-19 12:18:18 +01:00
Laurent Destailleur	d4ae0395ed	NEW Look and feel v8: Use a different picto for delete and unlink	2018-03-18 19:13:42 +01:00
Laurent Destailleur	7b71e29fa0	Duplicate translation	2018-03-17 15:17:35 +01:00
Laurent Destailleur	bbb095bcb2	FIX css	2018-03-16 12:19:16 +01:00
Laurent Destailleur	07fb29f0c4	Fix var not initialized	2018-03-16 12:18:20 +01:00
Laurent Destailleur	1716ac5f44	Fix var not initialized	2018-03-16 01:05:49 +01:00
Laurent Destailleur	5a397fff72	Fix scrutinizer bugs	2018-03-16 00:16:32 +01:00
Laurent Destailleur	c83b0bd53c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-03-15 15:11:35 +01:00
Laurent Destailleur	c4ca4a5a16	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/tva/index.php htdocs/install/mysql/data/llx_accounting_category.sql	2018-03-15 15:11:18 +01:00
Laurent Destailleur	c9566e9501	Merge pull request #8392 from aspangaro/8.0-a9 ... NEW Add stats in salaries module	2018-03-15 14:28:35 +01:00
Laurent Destailleur	ce0144e645	Add code to help debug	2018-03-15 13:21:02 +01:00
Laurent Destailleur	542eb2e5f4	Comment	2018-03-15 13:19:29 +01:00
Laurent Destailleur	85e307d6b8	Fix report when group is not dedicated to a country	2018-03-15 12:31:24 +01:00
Laurent Destailleur	b379a2f83c	FIX css	2018-03-15 10:43:04 +01:00
Laurent Destailleur	d804764134	Standardize look and feel	2018-03-15 10:41:43 +01:00
Laurent Destailleur	97c8504915	Fix remove log	2018-03-15 10:26:06 +01:00
Alexandre SPANGARO	9ce6ab915c	Merge remote-tracking branch 'uptream/develop' into 8.0-a9	2018-03-15 06:24:51 +01:00
Alexandre SPANGARO	5eccc6bcbc	NEW Add stats in salaries module	2018-03-15 06:23:20 +01:00
Laurent Destailleur	852bf8dab7	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/card.php htdocs/societe/class/societe.class.php	2018-03-15 01:57:35 +01:00
Laurent Destailleur	4957ea9178	Fix SQLi reported by op7ica	2018-03-15 01:55:16 +01:00
Laurent Destailleur	78b0585798	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/taxes.php	2018-03-12 19:09:57 +01:00
Laurent Destailleur	98b7d4c2e2	NEW Can set the start/end date of service line in invoice templates	2018-03-12 12:27:40 +01:00
Laurent Destailleur	93f4d6fdcd	Translation	2018-03-11 21:34:38 +01:00
Laurent Destailleur	e1654f4215	Fix division by zero	2018-03-11 21:18:18 +01:00
Laurent Destailleur	5c4b5cc74f	fix	2018-03-11 00:40:35 +01:00
Laurent Destailleur	897b3f7b79	Fix setup	2018-03-11 00:31:26 +01:00
Laurent Destailleur	390618db47	Fix bad space	2018-03-10 22:42:28 +01:00
Laurent Destailleur	bdb6a09762	Fix phpcs	2018-03-10 22:41:57 +01:00
Laurent Destailleur	dfb3d1b3bc	Merge pull request #8325 from inoveaconseil/develop ... Add execution date on direct debit	2018-03-10 22:11:58 +01:00
Laurent Destailleur	bb835d3633	Update bonprelevement.class.php	2018-03-10 22:09:32 +01:00
Laurent Destailleur	f609547bc9	Update bonprelevement.class.php	2018-03-10 18:50:41 +01:00
Laurent Destailleur	9e0c74ca20	Update bonprelevement.class.php	2018-03-10 18:49:48 +01:00
Laurent Destailleur	b0bd8cf910	Update facture.class.php	2018-03-10 12:56:19 +01:00
Inovea Conseil	d2dff92f26	Add execution date on prelevement	2018-03-10 11:28:12 +01:00
Inovea Conseil	975300b90b	Add execution date on prelevement	2018-03-10 11:23:35 +01:00
florian HENRY	40fb803ffd	scrunitizer	2018-03-10 09:34:33 +01:00
florian HENRY	63fb53159c	fix scrunitizer	2018-03-10 01:12:47 +01:00
florian HENRY	8e84b733dc	fix scrutinizer	2018-03-10 00:13:41 +01:00
Laurent Destailleur	20ec269d4d	Merge pull request #8318 from atm-florian/7.0_betterthirdpartylink ... 7.0 betterthirdpartylink	2018-03-09 23:03:23 +01:00
Laurent Destailleur	d8d13a7348	Merge branch 'develop' into 7.0_fix_invoicelist	2018-03-09 22:37:20 +01:00
florian HENRY	a34709c112	fix better thirdparty link	2018-03-09 22:36:00 +01:00
florian HENRY	164ca682d5	fix add "late" invoice into "save last search/backtolist" feature	2018-03-09 17:23:43 +01:00
Regis Houssin	82057b3523	Fix: use code instead id	2018-03-09 08:11:02 +01:00
Laurent Destailleur	9f42e1b172	Prepare code to introduce different payment modes than BAN	2018-03-08 22:33:40 +01:00
Laurent Destailleur	1c9e7145e7	Merge pull request #8276 from ATM-Consulting/develop_atm ... NEW: supplier credit notes & discounts (absolute and relative)	2018-03-08 20:06:37 +01:00
Regis Houssin	861a831e24	Fix: debug	2018-03-08 11:53:46 +01:00
Regis Houssin	fd9c79fa7f	Fix: use getEntity if no rowid to compare	2018-03-08 07:42:17 +01:00
Regis Houssin	93a9430e49	Fix: regression, restore primary key	2018-03-08 07:41:54 +01:00
Alexandre SPANGARO	0182b724aa	Merge remote-tracking branch 'uptream/develop' into 8.0-a7	2018-03-08 06:53:54 +01:00
Alexandre SPANGARO	3f2aa6a4fb	New : On invoice card, show accounting account linked	2018-03-08 06:52:31 +01:00
Laurent Destailleur	69ef6a9316	Fix data on thirdparty tooltip	2018-03-07 19:13:54 +01:00
Laurent Destailleur	fe45e82e99	Fix use of table llx_c_paiement (param showempty was not used/set)	2018-03-07 19:00:38 +01:00
Laurent Destailleur	65c689cc81	Clean code	2018-03-07 18:32:47 +01:00
Laurent Destailleur	3287c03e67	Fix data on thirdparty tooltip	2018-03-07 18:32:25 +01:00
Laurent Destailleur	c1497b065c	CSS	2018-03-07 14:13:55 +01:00
Laurent Destailleur	1ca5c7083a	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.formother.class.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php	2018-03-07 11:54:48 +01:00
Laurent Destailleur	0dfc9af72a	FIX multicompany compatibility and fix reports	2018-03-06 19:58:13 +01:00
Laurent Destailleur	1e6a55745c	CSS	2018-03-06 11:54:05 +01:00
Laurent Destailleur	a086bd0137	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/actions_linkedfiles.inc.php htdocs/core/class/utils.class.php	2018-03-06 09:20:45 +01:00
Laurent Destailleur	0cfa19ee09	NEW Online payment of invoice and subscription record the payment ... automatically.	2018-03-06 00:12:23 +01:00
Laurent Destailleur	d569adea2f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-03-05 21:46:40 +01:00
Laurent Destailleur	2f9f4d0675	WIP Create payment of member subscription with paypal	2018-03-05 21:46:24 +01:00
Alexis ALGOUD	35002cf93d	Merge branch 'develop' into NEW_price_on_stock_mvt	2018-03-05 17:45:27 +01:00
Marc de Lima Lucio	1765b09fda	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm	2018-03-05 11:05:38 +01:00
Laurent Destailleur	864edce665	NEW Accept anonmymous events (no user assigned) ... NEW Online payment now record the payment on invoices	2018-03-04 19:39:46 +01:00
Laurent Destailleur	82fd84fb48	Fix scrutinizer errors	2018-03-04 11:22:43 +01:00
Laurent Destailleur	4137e1cc76	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-03-02 17:56:30 +01:00
Laurent Destailleur	6bb91dd5d2	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2018-03-02 17:54:42 +01:00
Laurent Destailleur	d35c5282d4	Merge pull request #8245 from enstentechnologies/7.0 ... FIX Unknown column 'pl.amount_requested' in compta/prelevement/factures.php	2018-03-02 17:52:23 +01:00
Marc de Lima Lucio	451d943927	NEW: supplier credit notes: factorized discount block (+ correct translations for supplier discounts)	2018-03-02 16:48:25 +01:00
Laurent Destailleur	e073fa15f7	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-03-02 14:00:27 +01:00
Laurent Destailleur	a815326a28	Fix filters on bank entry list	2018-03-01 12:37:03 +01:00
Laurent Destailleur	54edd51847	Fix look and feel v7	2018-03-01 12:07:19 +01:00
Laurent Destailleur	822dd4778c	Fix info in tooltip	2018-03-01 12:03:50 +01:00
Laurent Destailleur	d25270a6f4	Fix ref not visible in payment link	2018-03-01 11:53:02 +01:00
Laurent Destailleur	bc04b3ee27	Fix min decimal on amount in payment page	2018-03-01 11:52:50 +01:00
Laurent Destailleur	be3e8a0e2d	FIX Look and feel v7	2018-03-01 11:52:41 +01:00
Laurent Destailleur	2368cb615f	Look and feel v8	2018-03-01 11:51:25 +01:00
Laurent Destailleur	158ef79e70	FIX Look and feel v7	2018-03-01 11:51:13 +01:00
Marc de Lima Lucio	059801fe03	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm	2018-03-01 10:22:21 +01:00
Laurent Destailleur	f7fe8ce141	Fix min decimal on amount in payment page	2018-03-01 02:53:47 +01:00
Laurent Destailleur	c190ec5a2c	Fix ref not visible in payment link	2018-03-01 02:49:44 +01:00
Laurent Destailleur	ee488ed83e	FIX invoice creation fails when next date not defined	2018-02-27 20:24:50 +01:00
Laurent Destailleur	f3c9d38f82	FIX invoice creation fails when next date not defined	2018-02-27 20:23:55 +01:00
Laurent Destailleur	04934cc4aa	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/contrat/class/contrat.class.php htdocs/core/lib/functions.lib.php htdocs/projet/tasks/time.php	2018-02-27 19:18:43 +01:00
Laurent Destailleur	75cbc466d5	Fix warning	2018-02-27 19:08:38 +01:00
Laurent Destailleur	b090f0da9c	Fix warning	2018-02-27 19:07:58 +01:00
Laurent Destailleur	1907b9c52d	Fix search on dates on template invoices	2018-02-27 19:04:21 +01:00
Laurent Destailleur	7ba263c9ab	Fix search on dates on template invoices	2018-02-27 19:03:14 +01:00
Marc de Lima Lucio	7cd1b2caa9	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm	2018-02-27 16:45:01 +01:00
gauthier	4d05bff780	FIX : if we make a mistake with situation_percent, now we can correct it. before situation_final was always set to 1 and no way to go back	2018-02-27 12:27:25 +01:00
Laurent Destailleur	0cc84ab92f	FIX Missing restore_lastsearch_values	2018-02-26 21:21:28 +01:00
Laurent Destailleur	3c552cec15	FIX Missing restore_lastsearch_values	2018-02-26 21:16:40 +01:00
vabeltran	604cc5896e	FIX Unknown column 'pl.amount_requested' in compta/prelevement/factures.php ... Column 'amount_requested' in ORDER clause not exists because that column is called 'amount' now in 'prelevement_bons' table in db.	2018-02-26 12:31:40 +01:00
Laurent Destailleur	4866d63ece	Fix method getListOfPayments in the wrong class	2018-02-26 09:45:15 +01:00
Laurent Destailleur	41638e6dff	Fix back link of look and feel v7	2018-02-26 09:20:05 +01:00
Laurent Destailleur	003827eb06	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-25 15:01:19 +01:00
Laurent Destailleur	7ff94c88bd	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-02-25 15:00:31 +01:00
Laurent Destailleur	251136bebf	Fix PHPUnit	2018-02-25 15:00:14 +01:00
Laurent Destailleur	502f219f7f	Merge pull request #8231 from hregis/7.0_entity ... FIX missing object entity in fetch	2018-02-25 12:59:38 +01:00
Regis Houssin	703d976b3b	Fix: missing object entity in fetch	2018-02-24 16:21:16 +01:00
Regis Houssin	b216249214	Fix: missing hook parameters	2018-02-24 15:01:29 +01:00
Laurent Destailleur	0a79550f43	Fix oldcopy must be saved before update_extras	2018-02-23 16:11:00 +01:00
John	3b54afc9b2	Fix type lines import	2018-02-23 12:12:36 +01:00
John	c5b96e43c7	add new action to import order in invoice	2018-02-22 16:55:41 +01:00
John	a7a6630fad	Add popin dialog	2018-02-22 15:19:20 +01:00
Laurent Destailleur	b87feab1e3	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/commonobject.class.php	2018-02-22 12:19:20 +01:00
Laurent Destailleur	bc0993d6cd	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-02-22 12:17:25 +01:00
John	3c1803f1f2	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_invoice_default_documents	2018-02-21 17:44:08 +01:00
John	f313fb925b	Add new checkbox for lines	2018-02-21 17:06:40 +01:00
Laurent Destailleur	b4446764f8	Clean code of deprecated usage	2018-02-21 14:48:25 +01:00
John	bd0e8506f5	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element	2018-02-21 11:53:16 +01:00
John	629b8e618e	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_invoice_default_documents	2018-02-21 11:45:23 +01:00
Laurent Destailleur	72c1357c9b	NEW Section of files generated by mass action not visible if empty	2018-02-21 11:02:45 +01:00
Marc de Lima Lucio	d3f848b7bc	FIX: supplier credit notes: harmonize discount filters part 2	2018-02-21 09:30:39 +01:00
Laurent Destailleur	c4130730cb	Clean code around fetch_optionals()	2018-02-20 19:38:18 +01:00
Laurent Destailleur	809ef1bd00	FIX Trigger *_MODIFY must be called when editing a property event extra. ... Clean duplicate trigggers "*_CLONE"	2018-02-20 18:09:38 +01:00
John	09c5dc506a	Add html dom element and fix class	2018-02-20 17:46:32 +01:00
John	5624257a6d	add new dom html5 elements and class	2018-02-20 16:49:49 +01:00