9475 Commits

Author	SHA1	Message	Date
Laurent Destailleur	96b6f0d8fb	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: composer.json htdocs/product/ajax/products.php htdocs/product/class/product.class.php	2015-12-21 12:24:24 +01:00
Laurent Destailleur	b179a193dd	Fix param for username is $username and not $login	2015-12-21 03:01:37 +01:00
Laurent Destailleur	a2ae9b9cfc	Fix forget password page must have a different title then login page ... Fix Missing translations	2015-12-21 00:47:44 +01:00
aspangaro	e38106019d	Add conditions to show menu on modules admin tools	2015-12-20 08:11:33 +01:00
aspangaro	e043098cc3	Add link in modules tools & correct auguria menu	2015-12-20 07:58:54 +01:00
Laurent Destailleur	f0802eb36b	FIX #4245 PHP 7	2015-12-19 19:48:36 +01:00
Laurent Destailleur	9334cf8fd1	FIX #4243 sql injection	2015-12-19 18:03:08 +01:00
Laurent Destailleur	d7e9c92144	Fix bad link on category ... Fix cancel button on categories Css enhancement.	2015-12-19 13:55:27 +01:00
aspangaro	8b3a5ac06f	Correct on auguria module	2015-12-19 06:39:25 +01:00
aspangaro	dc6143b6c7	Depend on accountancy module activation for the moment	2015-12-19 06:25:24 +01:00
aspangaro	2de5db927e	Merge remote-tracking branch 'Upstream/develop' into develop-a5	2015-12-19 05:50:19 +01:00
Laurent Destailleur	b1051c7396	Fix picto	2015-12-19 03:30:35 +01:00
Laurent Destailleur	a973c91c24	Fix pagination on cron jobs ... Fix perf when too much lines	2015-12-19 02:39:44 +01:00
Laurent Destailleur	f25a9030eb	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: .travis.yml htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php htdocs/core/modules/commande/doc/pdf_proforma.modules.php htdocs/includes/adodbtime/adodb-time.inc.php htdocs/langs/en_US/accountancy.lang	2015-12-18 22:12:03 +01:00
Laurent Destailleur	dd3f5a32d3	Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: .travis.yml composer.json htdocs/accountancy/admin/card.php	2015-12-18 21:20:12 +01:00
Laurent Destailleur	ebf68ecbe0	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: .travis.yml htdocs/contrat/class/contrat.class.php htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php htdocs/core/modules/project/pdf/pdf_baleine.modules.php	2015-12-18 21:03:57 +01:00
fappels	982db2e01f	Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_multi_warehouse	2015-12-18 19:31:02 +01:00
Laurent Destailleur	484dc5937b	Fix regression in sorting	2015-12-18 18:05:07 +01:00
fappels	7fc8007571	New add shipping and dispatching from/to multiple warehouses ... Add select2 to warehouse selectors Ship customer orderline from multiple warehouses Dispatch client orderline to multiple warehouses	2015-12-18 18:00:31 +01:00
Laurent Destailleur	43044bbb4f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-12-18 17:32:54 +01:00
Laurent Destailleur	eaacfabdf6	Merge pull request #4261 from hregis/3.8_bug ... Fix: Disable "main.inc.php" hooks with ajax return	2015-12-18 17:32:45 +01:00
Laurent Destailleur	4998516835	Code comment	2015-12-18 17:31:50 +01:00
Laurent Destailleur	724817b966	Merge pull request #4259 from aschio/develop_sunimport ... Adding extrafields to shipments module	2015-12-18 17:28:35 +01:00
Laurent Destailleur	dc8e5f45ae	Merge pull request #4254 from grandoc/develop ... [Qual] Uniformize code	2015-12-18 17:13:22 +01:00
Laurent Destailleur	c328860af0	Merge pull request #4250 from GPCsolutions/dolibarr-4242 ... FIX #4242 Allow disabling dashes in documents	2015-12-18 17:07:00 +01:00
Laurent Destailleur	452feca64a	Merge pull request #4249 from GPCsolutions/3.8-4242 ... FIX #4242 Allow disabling dashes in documents	2015-12-18 17:06:51 +01:00
Regis Houssin	70354def7c	Fix: Disable "main.inc.php" hooks with ajax return	2015-12-18 13:27:51 +01:00
Laurent Destailleur	98cd4f8307	Fix message so it is more clear what the feature can do or not. ... Fix list of email templates must be hidden for templates of disabled modules.	2015-12-18 12:48:20 +01:00
cla	cb96618460	Merge branch 'develop' into develop_sunimport	2015-12-18 10:49:57 +01:00
Laurent Destailleur	b10f9d4ca3	Fix: when doing an export of extrafields, we must use different table ... alias for each extrafield table.	2015-12-17 20:40:33 +01:00
Laurent Destailleur	cdc408a84c	Fix: button "now" was not working on date using no javascript	2015-12-17 17:16:26 +01:00
philippe grand	367d9de0b7	fix some translation	2015-12-17 17:12:28 +01:00
Laurent Destailleur	ba3c8de785	Update doc comment to make things cleaner to avoid confusion between old ... deprecated doActions of canvas and doActions of triggers.	2015-12-17 14:01:22 +01:00
aspangaro	ea73e0253c	Move fiscal year from accountancy module to configuration of Dolibarr	2015-12-17 13:09:46 +01:00
Raphaël Doursenaud	4f9ab7da24	FIX #4242 Allow disabling dashes in documents ... 3.9 specific fix since document have moved	2015-12-17 10:39:55 +01:00
Raphaël Doursenaud	7e98cfd5b6	FIX #4242 Allow disabling dashes in documents ... 3.8 specific fix for new documents	2015-12-17 10:33:17 +01:00
Raphaël Doursenaud	02e053acc6	FIX #4242 Allow disabling dashes in documents ... 3.7 specific fix since document files have moved	2015-12-17 10:26:27 +01:00
Raphaël Doursenaud	e6ec797af8	FIX #4242 Allow disabling dashes in documents	2015-12-17 10:21:44 +01:00
Laurent Destailleur	acc4623b74	Merge pull request #4236 from defrance/patch-90 ... fix ErrorBadValueForParamNotAString shit one again...	2015-12-16 19:25:39 +01:00
Laurent Destailleur	516e071363	Merge pull request #4232 from aspangaro/develop-remove_zero ... New: Accountancy add a function to remove all zero at the right of the account	2015-12-16 19:13:43 +01:00
Laurent Destailleur	4ef832b94b	Merge pull request #4215 from frederic34/patch-7 ... Update sms.php	2015-12-16 19:02:07 +01:00
cla	ef487c48a4	NEW ... Extrafields for: - expedition, expeditiondet, livraison, livraisondet	2015-12-16 16:18:29 +01:00
BENKE Charlie	afe3e6ac27	fix ErrorBadValueForParamNotAString shit one again...	2015-12-16 12:38:32 +01:00
aspangaro	36bc1321cb	Merge remote-tracking branch 'Upstream/develop' into develop-remove_zero	2015-12-15 20:50:49 +01:00
aspangaro	c1e77daeb1	New: Accountancy add a function to remove all zero at the right of the account. ... Thanks to Florian	2015-12-15 20:48:06 +01:00
Laurent Destailleur	90dbfc4870	Fix: to avoid confusion between amount of payment and amount distributed ... on invoice when a payment is done for several invoices, export of payment can export both fields.	2015-12-15 15:52:20 +01:00
Laurent Destailleur	3e3dbf850f	Fix: bad case for function	2015-12-15 09:44:17 +01:00
Laurent Destailleur	40269c3c70	Fix Remove syntax warnings	2015-12-15 09:43:39 +01:00
aspangaro	687370071b	A function to remove zero at the end of the account	2015-12-14 21:38:30 +01:00
Laurent Destailleur	0ec62c05cc	Fix bad var name. Removed warning.	2015-12-14 09:14:34 +01:00