5233 Commits

Author	SHA1	Message	Date
Laurent Destailleur	c73fe965d2	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/commande/class/commande.class.php htdocs/compta/facture/class/facture.class.php	2015-08-13 03:58:32 +02:00
Laurent Destailleur	1595765ec8	Merge remote-tracking branch 'origin/3.5' into 3.6 ... Conflicts: htdocs/compta/facture/class/facture.class.php	2015-08-13 03:18:02 +02:00
Laurent Destailleur	4b51fc80a6	Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 ... Conflicts: ChangeLog	2015-08-13 00:06:27 +02:00
Juanjo Menent	9374b4f3e3	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-08-10 12:14:18 +02:00
Marcos García de La Fuente	7cb564586e	Fix: [ bug #3310 ] OrderLine::fetch, FactureLigne::fetch and PropaleLigne::fetch do not return anything ... Close #3310	2015-08-09 13:52:02 +02:00
Marcos García de La Fuente	a24f29ba8b	Fix [ bug #3341 ]: Missing translation in /compta/paiement_charge.php ... Close #3341	2015-08-09 13:37:05 +02:00
Juanjo Menent	2a67bd1f38	Fix #3314 Display state in bank account card	2015-08-01 14:43:04 +02:00
Laurent Destailleur	13dee1876a	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/compta/resultat/clientfourn.php	2015-07-30 15:07:22 +02:00
Raphaël Doursenaud	3b9c8a685b	Fix #3314 Display state in bank account card	2015-07-29 19:29:18 +02:00
Marcos García de La Fuente	038f171d6c	Fix: [ bug #3074 ] Accruals accounting use payment date instead of commitment date in turnover reports for salaries ... Close #3074	2015-07-20 12:18:30 +02:00
Laurent Destailleur	2bb1945a2f	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/compta/prelevement/class/rejetprelevement.class.php htdocs/compta/sociales/class/paymentsocialcontribution.class.php htdocs/contact/exportimport.php htdocs/contact/ldap.php htdocs/contact/perso.php htdocs/contact/vcard.php htdocs/core/class/commonobject.class.php htdocs/product/reassort.php htdocs/projet/liste.php htdocs/societe/consumption.php htdocs/societe/info.php	2015-07-19 12:04:30 +02:00
Laurent Destailleur	fbc0b5b313	Merge remote-tracking branch 'origin/3.5' into 3.6 ... Conflicts: htdocs/contact/vcard.php htdocs/societe/consumption.php	2015-07-19 11:38:44 +02:00
Marcos García de La Fuente	d0b1652efd	Merge branch '3.5' into bug-3206 ... Conflicts: ChangeLog	2015-07-19 11:16:10 +02:00
Marcos García de La Fuente	4649cf7210	Fix: [ bug #3206 ] PropaleLigne, OrderLine and FactureLigne given to triggers through update function does not contain all the information ... Close #3206	2015-07-18 19:40:48 +02:00
Marcos García de La Fuente	7185cfeb84	Fix: [ bug #2715 ] Statistics page has broken layout with long thirdparty names	2015-07-18 14:48:59 +02:00
Maxime Kohlhaas	20bdfdb286	Fix : withdrawal rejection were taking the total amount of the invoice instead of the amount of the withdrawal	2015-07-14 11:57:47 +02:00
Maxime Kohlhaas	5d14d05ce1	Fix : Social contribution payment deletion was not deleting the bank line	2015-07-03 16:38:54 +02:00
Laurent Destailleur	a7cec18081	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/categories/fiche.php htdocs/core/tpl/objectline_create.tpl.php htdocs/install/upgrade2.php htdocs/product/liste.php	2015-06-14 17:11:36 +02:00
Laurent Destailleur	f4da53c300	Merge remote-tracking branch 'origin/3.5' into 3.6 ... Conflicts: htdocs/product/liste.php htdocs/product/price.php	2015-06-14 17:04:24 +02:00
Regis Houssin	b96ed08260	Fix: select date problem with mobile device (#3039)	2015-06-14 12:46:27 +02:00
Marcos García de La Fuente	200eb7b1bb	FIX Close bug #2855 Wrong translation key in localtax report page	2015-06-12 16:27:17 +02:00
Regis Houssin	9a812a6c28	Fix: add filter for "dol_most_recent_files" for avoid conflict with ... option "Save file on server with name "FA0700034-Original filename""	2015-06-06 13:03:02 +02:00
phf	9f52b9e800	FIX : #2901	2015-05-29 17:27:05 +02:00
Laurent Destailleur	11d4a945b0	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/adherents/liste.php htdocs/comm/propal.php htdocs/compta/facture.php htdocs/contact/list.php htdocs/contrat/liste.php htdocs/product/liste.php	2015-05-25 18:08:23 +02:00
Laurent Destailleur	dcc197eb6b	Fix bug debian 786479	2015-05-22 17:13:32 +02:00
Laurent Destailleur	2f5d1f5965	Merge pull request #2842 from atm-alexis/fix_email_cc_in_selectlist_on_propal ... Fix email cc in selectlist on propal/bill	2015-05-22 16:56:53 +02:00
Laurent Destailleur	4de46892d1	Merge pull request #2872 from atm-alexis/fix_button_create_payment_on_social_tax_less_than_1euro ... FIX button create payment hide if tax amount is less than 1	2015-05-22 16:53:49 +02:00
Maxime Kohlhaas	ff6708840d	Fix : facturestats was not filtering on invoice type	2015-05-22 09:23:28 +02:00
Alexis Algoud	81a919e8a3	round to price2num	2015-05-22 09:05:38 +02:00
Alexis Algoud	9184b08f94	FIX button create payment hide if tax amount is less than 1	2015-05-21 16:51:21 +02:00
Francis Appels	40ef5737fc	Fix: SQL error in facturestats on no view rights ... table alias sc must be available when user has no rights to view customers. see where defenition line 80	2015-05-19 16:34:21 +02:00
Alexis Algoud	a4031a3680	if contact in sellist, it's an Id	2015-05-18 18:33:17 +02:00
Alexis Algoud	3dc5ffa871	FIX send mail, copy sendto don't read the list of contact	2015-05-13 18:05:26 +02:00
Laurent Destailleur	971e23e006	Fix special_code was lost when updating line	2015-05-07 12:10:27 +02:00
Maxime Kohlhaas	54a68116e4	Fix : prevelement with SEPA	2015-04-19 01:55:35 +02:00
Laurent Destailleur	5b29c87933	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/compta/deplacement/fiche.php htdocs/core/tpl/objectline_create.tpl.php htdocs/expedition/fiche.php	2015-04-19 00:23:46 +02:00
Laurent Destailleur	ab77158757	Merge remote-tracking branch 'origin/3.5' into 3.6 ... Conflicts: htdocs/expedition/fiche.php	2015-04-18 23:55:17 +02:00
Laurent Destailleur	9b69b64626	Merge branch 'bug-2583' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2583 ... Conflicts: ChangeLog	2015-04-18 20:10:06 +02:00
Maxime Kohlhaas	e0af2feced	Fix : on impayees remain to pay did not include deposits	2015-04-18 18:06:02 +02:00
Marcos García de La Fuente	8f0c41dbd2	Fix: [ bug #1905 ] Custom deplacement types do not get translated in deplacement card	2015-04-12 22:02:25 +02:00
Marcos García de La Fuente	6173706531	Fix: [ bug #1906 ] Deplacement does not allow translated decimal format	2015-04-12 21:55:20 +02:00
Marcos García de La Fuente	728b64e334	Fix Bug #2583: Unable to create a bank transfer with localized numbers	2015-04-12 20:24:22 +02:00
Laurent Destailleur	1272b03e5e	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: build/debian/changelog htdocs/commande/fiche.php htdocs/compta/facture.php htdocs/core/menus/standard/eldy.lib.php htdocs/fourn/facture/fiche.php htdocs/product/stock/mouvement.php htdocs/projet/element.php htdocs/societe/rib.php htdocs/theme/bureau2crea/img/statut4.png	2015-04-12 12:03:59 +02:00
Laurent Destailleur	bb83eb0f68	Merge pull request #2561 from frederic34/patch-5 ... Fix #2559 Bug: Untranslated "Total" in Bank module	2015-04-07 23:50:17 +02:00
Juanjo Menent	1ab70a7086	Solves #2542 Bug: Contracts store localtax preferences ... Conflicts: htdocs/compta/facture.php	2015-04-07 20:05:56 +02:00
Juanjo Menent	35a6ed90a0	Solves #2542 Bug: Contracts store localtax preferences	2015-04-07 20:02:12 +02:00
Frédéric FRANCE	06c749942a	Update index.php	2015-04-07 18:40:19 +02:00
Frédéric FRANCE	7a2942684c	Fix #2559 Bug: Untranslated "Total" in Bank module	2015-04-07 12:45:25 +02:00
Marcos García de La Fuente	40860a84d1	Closes #2543: Untranslated "Contract" origin string when creating an invoice from a contract	2015-04-04 17:28:24 +02:00
Juanjo Menent	851cae80a2	Fix: [ bug #1836 ] Required parameter missing in Rejetprelevement line ... 159	2015-03-14 10:16:50 +01:00