Commit Graph

5862 Commits

Author SHA1 Message Date
Laurent Destailleur
15aebfb7a3 Merge pull request #1455 from marcosgdf/bug-loadban
Corrected bug when creating document from ODT template
2014-03-06 18:38:56 +01:00
Laurent Destailleur
260dfe3844 Merge pull request #1454 from marcosgdf/locale-line-odt-tags
Locale line ODT tags
2014-03-06 18:34:33 +01:00
Laurent Destailleur
cd3e56a2d0 Merge pull request #1450 from grandoc/develop
fix english misspelling
2014-03-06 18:23:51 +01:00
Marcos García de La Fuente
ca0eb7919e Corrected call to non-existing function 2014-03-06 09:02:36 +01:00
Marcos García de La Fuente
4433f6e8b7 Missing copyright info 2014-03-06 09:01:44 +01:00
Marcos García de La Fuente
c7566893a3 Corrected array indentation 2014-03-06 08:56:28 +01:00
Marcos García de La Fuente
2c22c7707f Created locale ODT line tags for invoice, shipment and order modules, and corrected the use of line_price_ht, line_price_ttc and line_price_vat tags 2014-03-06 08:55:37 +01:00
Laurent Destailleur
fa098adc78 Fix: infinite loop in function num_public_holiday 2014-03-05 21:29:33 +01:00
Laurent Destailleur
774017672f Fix: Number of day calculation. Add PHPUnit case. 2014-03-05 20:52:27 +01:00
Laurent Destailleur
6f60755426 New: Add option MAIN_FAVICON_URL 2014-03-05 17:26:59 +01:00
Laurent Destailleur
16a074a69b Use better module id number 2014-03-05 12:25:31 +01:00
Grand Philippe
e32d31f76d fix english misspelling 2014-03-05 09:58:52 +01:00
philippe
e2b29bb108 fix english misspelling 2014-03-05 09:57:36 +01:00
Laurent Destailleur
cdd2815d45 Merge pull request #1449 from KreizIT/dluo_step2
Dluo step2
2014-03-05 00:08:58 +01:00
Laurent Destailleur
c5e639041e More doc comment 2014-03-04 23:56:35 +01:00
KreizIT
7f275dfbf4 - Add table modification for product (forget in step 1)
- Add module for batch number management
- change dependency for stock and product
- change product class and fiche showing new select for batch managment on product
2014-03-04 18:55:55 +01:00
Laurent Destailleur
24b0ea6613 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/comm/propal.php
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.commande.class.php
2014-03-03 19:38:02 +01:00
Laurent Destailleur
df829177bc Fix: Submit form of graph box was reseting params of others. 2014-03-02 17:45:40 +01:00
Laurent Destailleur
fd9d0747c8 Fix: Bad description 2014-03-02 16:44:31 +01:00
Laurent Destailleur
998ecc3c15 Optimize code. 2014-03-01 15:59:09 +01:00
Laurent Destailleur
206181a542 Merge pull request #1441 from syrus34/patch-3
Update commondocgenerator.class.php
2014-03-01 13:40:14 +01:00
Laurent Destailleur
b64a2b2718 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/comm/action/fiche.php
2014-02-28 21:43:29 +01:00
Laurent Destailleur
68a508a0d1 Fix: sql error on numbering module for tasks 2014-02-28 21:40:08 +01:00
syrus34
dbdb8de79d Update commondocgenerator.class.php
With version 3.5, a company can have several bank account
2014-02-28 07:06:38 +01:00
BENKE Charles
303c459777 Update modProjet.class.php
bad incrementation
2014-02-27 11:29:08 +01:00
Laurent Destailleur
193a551b0a Merge pull request #1421 from defrance69/patch-30
Update modProjet.class.php
2014-02-27 11:19:28 +01:00
Laurent Destailleur
8f0e96fd02 Merge pull request #1440 from grandoc/develop
anglicized
2014-02-27 11:17:30 +01:00
Laurent Destailleur
827f7e898a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-02-27 10:50:27 +01:00
Laurent Destailleur
06b1c8b64a Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
2014-02-27 10:47:15 +01:00
Laurent Destailleur
f7fe25e408 Uniformize code to prepare mass update 2014-02-27 10:37:23 +01:00
philippe
5c4ceb1a53 anglicized 2014-02-27 10:06:11 +01:00
philippe
1223e6a08b anglicized 2014-02-27 09:54:31 +01:00
Laurent Destailleur
4be679a7b2 Second try for Fix: The delivery date was missing. 2014-02-26 17:25:32 +01:00
Laurent Destailleur
0c2ca119d7 Fix: Add a test to avoid the non stable and experimental fuc...
feature "MAIN_MENU_USE_JQUERY_LAYOUT" to make application hang.
2014-02-26 16:51:38 +01:00
Laurent Destailleur
480b09f192 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/societe/class/societe.class.php
2014-02-26 15:49:29 +01:00
Laurent Destailleur
9505f9e47c Fix: The delivery date was missing. 2014-02-26 15:41:56 +01:00
Laurent Destailleur
855dac45ea Fix: select_comptes was always making a filter on field clos making
other filter field not working in some case.
2014-02-26 15:29:40 +01:00
Laurent Destailleur
a822bc0736 Fix: The delivery date was missing. 2014-02-25 19:22:00 +01:00
Laurent Destailleur
abff284ab1 Fix: The delivery date was missing. 2014-02-25 19:07:42 +01:00
Laurent Destailleur
1790f905c9 Removed some code specific to databases and use instead correct abstract
method of drivers.
2014-02-25 18:25:17 +01:00
Laurent Destailleur
3f05651b94 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2014-02-25 16:14:51 +01:00
Laurent Destailleur
63a2aa3365 Fix: sql error with postgres when creating extrafield with an upper cas
character. code for new fields must be always lowercase.
2014-02-25 15:48:13 +01:00
Laurent Destailleur
7241714551 Merge pull request #1435 from marcosgdf/export-translations
Corrected export translations
2014-02-25 14:11:40 +01:00
Marcos García de La Fuente
e963f55593 Corrected CS error 2014-02-25 13:34:33 +01:00
Marcos García de La Fuente
f7eb4c5b14 Updated user export labels 2014-02-25 04:39:41 +01:00
Marcos García de La Fuente
4fe8e00601 Removed deprecated code 2014-02-25 04:29:34 +01:00
Marcos García de La Fuente
d69939b7b1 Function dol_clone is now a deprecated function 2014-02-25 04:29:09 +01:00
Marcos García de La Fuente
4411908b23 Fixed translations of project export wizard 2014-02-25 04:18:13 +01:00
Laurent Destailleur
f537f62aea Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/compta/facture/impayees.php
2014-02-24 17:09:21 +01:00
Laurent Destailleur
22854e5743 New: Sending remind of unpayed invoices by emails (need tester) 2014-02-24 16:50:36 +01:00