Commit Graph

38010 Commits

Author SHA1 Message Date
Laurent Destailleur
dd10ff8a11 eol 2013-07-15 18:51:56 +02:00
Laurent Destailleur
9e9e5224f6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-15 18:45:23 +02:00
Laurent Destailleur
17f3d98fb3 New: Add option to exclude some thirdparties 2013-07-15 18:44:59 +02:00
Laurent Destailleur
d3992ec2eb Merge pull request #1093 from FHenry/develop
Use reopen method to repoen proposal and fire trigger PROPAL_REOPEN
2013-07-15 01:51:44 -07:00
Florian Henry
d09af2b18e Better use of reopen method 2013-07-15 09:37:55 +02:00
Florian Henry
9d0fe3c1da Use reopen method to repoen proposal and fire trigger PROPAL_REOPEN 2013-07-15 09:33:26 +02:00
Laurent Destailleur
d637212dce Fix: alternative url were sometimes relative to server, sometimes to
DOL_URL_ROOT. Fix to be always relative to DOL_URL_ROOT.
2013-07-15 00:58:40 +02:00
Laurent Destailleur
254f46752e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-15 00:41:46 +02:00
Laurent Destailleur
08f8acc867 More complete example 2013-07-15 00:41:27 +02:00
Laurent Destailleur
5fb707f918 Fix: Restore disappeared feature 2013-07-14 21:02:00 +02:00
Laurent Destailleur
446cc162cd Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
	htdocs/compta/facture/impayees.php
2013-07-14 20:33:54 +02:00
Laurent Destailleur
c24659b3a5 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-07-14 20:29:25 +02:00
Laurent Destailleur
dc5ad1a0f3 Fix: Total missing 2013-07-14 20:29:07 +02:00
Laurent Destailleur
f4dfac045a Fix: Bad default mysql driver 2013-07-14 20:20:52 +02:00
Laurent Destailleur
9c9b81c981 Merge pull request #1092 from atm-maxime/mko862
Task 862 : ODT on shipment
2013-07-14 10:21:10 -07:00
Laurent Destailleur
001072d34c Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE 2013-07-14 18:43:58 +02:00
Laurent Destailleur
6a1446f4dd Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE 2013-07-14 16:35:02 +02:00
Maxime Kohlhaas
9e5286bce9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko862
Conflicts:
	htdocs/core/class/html.formfile.class.php
2013-07-14 13:27:41 +02:00
Maxime Kohlhaas
4fd1b5364e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-07-14 13:25:20 +02:00
Laurent Destailleur
cc124e03c1 Fix: Missing comma 2013-07-14 03:38:07 +02:00
Laurent Destailleur
0a3bd58645 Fix: Duplicate button 2013-07-14 03:28:19 +02:00
Laurent Destailleur
a1e7663614 eol 2013-07-14 01:49:43 +02:00
Laurent Destailleur
89d8eb19c0 Fix: navigation fails 2013-07-14 01:29:26 +02:00
Laurent Destailleur
ada3df4245 eol 2013-07-14 01:21:00 +02:00
Laurent Destailleur
94e3277516 Fix: Navigation after using numbering for supplier ref. 2013-07-14 01:19:05 +02:00
Laurent Destailleur
57ab24baca Fix: bad sort order into ecm module 2013-07-14 01:10:23 +02:00
Laurent Destailleur
154cd1fcf9 Fix: Sort on ref for supplier invoice into ged 2013-07-14 01:10:18 +02:00
Laurent Destailleur
460778818c Fix: automatic ecm for supplier invoices 2013-07-14 01:10:11 +02:00
Laurent Destailleur
8a8e55ffd3 Fix: bad sort order into ecm module 2013-07-14 01:08:53 +02:00
Laurent Destailleur
1e6171ad0e Fix: Sort on ref for supplier invoice into ged 2013-07-14 00:40:22 +02:00
Laurent Destailleur
bbe9778ced Fix: automatic ecm for supplier invoices 2013-07-14 00:09:42 +02:00
Laurent Destailleur
4608e07753 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/compta/bank/account.php
2013-07-13 23:41:32 +02:00
Laurent Destailleur
55d14f430c Fix: Search on supplier ref 2013-07-13 23:36:21 +02:00
Laurent Destailleur
95ea3a01df Removed dead code 2013-07-13 23:05:25 +02:00
Laurent Destailleur
3a9ffb19c3 fix: eol 2013-07-13 21:14:05 +02:00
Laurent Destailleur
0f1c4032ab Add option all to export 2013-07-13 21:06:12 +02:00
Laurent Destailleur
bd53218245 More complete message 2013-07-13 20:25:55 +02:00
Laurent Destailleur
f169984c7c Better test 2013-07-13 20:22:17 +02:00
Laurent Destailleur
7cdc7c0ab2 Fix: Typo 2013-07-13 19:41:27 +02:00
Laurent Destailleur
7481aa121e Qual: All script files must add a line into log when launched. 2013-07-13 19:20:01 +02:00
Laurent Destailleur
73a33a6dae Fix: Bug to delete bank line 2013-07-13 17:56:23 +02:00
Laurent Destailleur
6db9b67e35 Fix: Missing user param 2013-07-13 17:55:36 +02:00
Laurent Destailleur
d06e9efc0f Fix: Bug to delete bank line 2013-07-13 17:55:14 +02:00
Laurent Destailleur
41cb5ec235 Fix: Missing label 2013-07-13 17:25:10 +02:00
Laurent Destailleur
3f94950b0e Fix: Clean supplier ref 2013-07-13 16:54:17 +02:00
Laurent Destailleur
330d2173be Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-13 15:37:30 +02:00
Maxime Kohlhaas
91e598398d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-07-13 11:44:45 +02:00
Maxime Kohlhaas
6c79247a4b Merge 2013-07-13 11:44:25 +02:00
Laurent Destailleur
b5820315f9 Fix: Correct permissions on files 2013-07-13 10:34:19 +02:00
Maxime Kohlhaas
0d1ab71b05 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-07-13 10:18:51 +02:00