lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
37,896 Commits 43 Branches 150 Tags 886 MiB
dd10ff8a11
Commit Graph

37896 Commits

This Branch
This Branch
All Branches
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
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
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
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
Laurent Destailleur
b5820315f9 Fix: Correct permissions on files 2013-07-13 10:34:19 +02:00
Laurent Destailleur
f009100126 Fix: Bad column 2013-07-12 16:51:31 +02:00
Laurent Destailleur
ad8904a4fb Can add a picto onto line of files list. 2013-07-12 15:10:32 +02:00
Laurent Destailleur
84447fec35 More complete examples 2013-07-12 10:57:49 +02:00
Laurent Destailleur
7cff7d3250 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-11 20:22:21 +02:00
Laurent Destailleur
2c0a01fc8c Merge remote-tracking branch 'origin/3.4' into develop 2013-07-11 17:57:06 +02:00
Maxime Kohlhaas
0d40debeac Merge branch 'develop' of github.com:atm-maxime/dolibarr into mko862 
Conflicts:
	htdocs/admin/system/perf.php
 2013-07-11 17:17:43 +02:00
Maxime Kohlhaas
3c7f4a3548 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko862 
Conflicts:
	htdocs/admin/system/perf.php
 2013-07-11 15:55:33 +02:00
Geoffrey
54961036be Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 
Conflicts:
	htdocs/admin/system/perf.php
 2013-07-11 15:40:10 +02:00
Laurent Destailleur
7485192cfb Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-07-11 11:56:57 +02:00
Laurent Destailleur
158a2b8ca8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/.gitignore
 2013-07-11 11:52:32 +02:00
simnandez
442ca8ea35 Trad: Fix ca_ES and es_ES missing translation 2013-07-11 11:51:13 +02:00
simnandez
11bf611618 Trad: Fix ca_ES and es_ES missing translation 2013-07-11 11:50:31 +02:00
Laurent Destailleur
807cbe4163 Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE 2013-07-11 09:43:07 +02:00
Laurent Destailleur
548ea4f93f Fix: Navigation 2013-07-10 23:58:49 +02:00