9955 Commits

Author	SHA1	Message	Date
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
Frédéric FRANCE	1aa232c4a7	Update CSMSFile.class.php	2015-12-13 21:14:53 +01:00
Laurent Destailleur	dc6ec91b2c	Merge pull request #4183 from IonAgorria/patch-3 ... JS error preventing hiding of dates at object line	2015-12-13 19:57:37 +01:00
Laurent Destailleur	4d11c8b733	Merge pull request #4212 from frederic34/patch-7 ... typo	2015-12-13 19:40:08 +01:00
Laurent Destailleur	646a198399	Merge pull request #4214 from frederic34/patch-8 ... typo	2015-12-13 19:39:56 +01:00
Laurent Destailleur	3b595f0247	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/accountancy/bookkeeping/list.php htdocs/accountancy/customer/list.php htdocs/accountancy/journal/bankjournal.php htdocs/core/lib/date.lib.php htdocs/core/lib/report.lib.php htdocs/langs/en_US/accountancy.lang	2015-12-13 16:23:33 +01:00
Laurent Destailleur	a462cd232d	Merge remote-tracking branch 'origin/3.7' into 3.8	2015-12-13 16:09:09 +01:00
Laurent Destailleur	4a88c9ea9f	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/product/class/product.class.php	2015-12-13 15:53:57 +01:00
Laurent Destailleur	7db6ac592f	FIX Option start tls of ldap was not correctly supported.	2015-12-13 15:51:52 +01:00
Laurent Destailleur	3680202c1c	Fix do not share color for title of table and title of pages	2015-12-13 14:39:12 +01:00
Frédéric FRANCE	9cc77787c5	typo	2015-12-12 16:10:36 +01:00
Laurent Destailleur	2a6fbe3526	Fix debug shipment doc generation (bad position of fields, code ... differences, text size, ...)	2015-12-12 14:55:32 +01:00
Laurent Destailleur	0330d8237f	Fix: Color too dark	2015-12-12 14:13:45 +01:00
Laurent Destailleur	84205b5be4	Fix: text too long	2015-12-12 14:12:53 +01:00
Frédéric FRANCE	442f669dc7	typo	2015-12-12 10:45:33 +01:00
Ion Agorria	26b85d7cac	Remove unnecesary variable	2015-12-11 18:28:55 +01:00
Laurent Destailleur	f71225742a	Merge pull request #4178 from GPCsolutions/dolibarr-3953 ... Better javascript rounding	2015-12-11 17:59:34 +01:00
Laurent Destailleur	47fce16778	Merge branch 'develop' of https://github.com/FHenry/dolibarr into ... FHenry-develop Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2015-12-11 17:04:19 +01:00
Florian HENRY	71d0024b27	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-12-11 11:31:37 +01:00
Ion Agorria	f34fb0d82d	More consistent check	2015-12-11 03:09:09 +01:00
Frédéric FRANCE	e193d9be97	Update CSMSFile.class.php	2015-12-10 23:08:21 +01:00