Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-22 09:21:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
45,231 Commits 36 Branches 190 Tags
0d801be6a1563f1c6b39683ab901b2ea69dce3b0
Commit Graph

6676 Commits

Author SHA1 Message Date
Florian Henry
ee82330292 On going sync/merge from other repo 2013-07-17 19:17:54 +02:00
Florian Henry
2476e7bcaf Start functionnality 2013-07-17 18:45:58 +02:00
Laurent Destailleur
7b97214df5 Merge pull request #1096 from FHenry/develop_categorycontact 
Develop categorycontact
 2013-07-17 08:41:02 -07:00
Laurent Destailleur
df88dc2f23 Use a better variable name 2013-07-17 14:57:20 +02:00
Maxime Kohlhaas
1c4c3285e2 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko149 2013-07-17 10:11:54 +02:00
Juanjo Menent
8bae6a774d Merge pull request #1095 from atm-maxime/develop 
Fix on turnover reports
 2013-07-16 23:47:56 -07:00
Florian Henry
4fee61beb0 Fix adding email into mailing module 
source_id is already added
 2013-07-16 21:34:24 +02:00
Florian Henry
e07eac9b17 [ task #519 ] Add category association with contacts 2013-07-16 21:04:58 +02:00
Maxime Kohlhaas
a6a058ddae Fix by including lib files 2013-07-16 18:45:40 +02:00
Laurent Destailleur
f564d1912e New: Add graph for supplier invoices. 
Fix: Error management into supplier invoice validation.
 2013-07-16 18:43:38 +02:00
Laurent Destailleur
efd855b186 Can replace a tag with file into parameter to ouput into list of files. 2013-07-16 17:50:12 +02:00
Maxime Kohlhaas
c0feda4921 Task 149 : added on product 2013-07-16 01:28:24 +02:00
Maxime Kohlhaas
aa8e43cd1b Task 149 : Add number of notes and attached files into tab. Started with thirdparty 2013-07-16 01:09:19 +02:00
Maxime Kohlhaas
c7f3778b90 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-07-16 00:21:06 +02:00
Laurent Destailleur
2ae1e787c9 Fix: Bad date ranges 
Conflicts:
	scripts/invoices/rebuild_merge_pdf.php
 2013-07-15 21:49:54 +02:00
Laurent Destailleur
e2b63bb8dd Fix: Bad date ranges 2013-07-15 21:47:45 +02:00
Laurent Destailleur
28c28bd217 New: Add option excludethirdparties and onlythirdparties into merge pdf 
scripts.
 2013-07-15 20:56:43 +02:00
Laurent Destailleur
dd10ff8a11 eol 2013-07-15 18:51:56 +02:00
Laurent Destailleur
17f3d98fb3 New: Add option to exclude some thirdparties 2013-07-15 18:44:59 +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
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
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
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
3a9ffb19c3 fix: eol 2013-07-13 21:14:05 +02:00
Laurent Destailleur
7cdc7c0ab2 Fix: Typo 2013-07-13 19:41:27 +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
ad8904a4fb Can add a picto onto line of files list. 2013-07-12 15:10:32 +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
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
Laurent Destailleur
807cbe4163 Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE 2013-07-11 09:43:07 +02:00
Laurent Destailleur
c174be7100 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-10 22:59:39 +02:00
Laurent Destailleur
f690860aa8 Fix: Avoid duplicate div error. 2013-07-10 22:58:53 +02:00
Maxime Kohlhaas
9d931b7b05 Task # 862 : ODT templates on shipment 2013-07-10 15:54:28 +02:00
Laurent Destailleur
57dbf87d0a Just use print instead of echo, just because echo is not use anuwhere 
else.
 2013-07-10 15:45:16 +02:00
Maxime Kohlhaas
cfc999a06d Merge 2013-07-10 15:44:53 +02:00
Laurent Destailleur
7ee23a9612 Merge pull request #1085 from csalvador/form_attach_new_file_hook 
hook in form_attach_new_file(html.formfile.class.php)
 2013-07-10 06:42:37 -07:00
Cédric Salvador
9619b09e37 rewriting to fit the new way to use hooks 2013-07-10 15:30:49 +02:00
Laurent Destailleur
a4abfe1abc New: Can add an event automatically when a projet is create. 2013-07-10 14:46:16 +02:00
Florian Henry
44cd024f89 Fix bug on from_confrim using ajax and radio button question type 2013-07-10 13:10:32 +02:00
Laurent Destailleur
fbf6f150bc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-09 21:41:05 +02:00
Laurent Destailleur
f67e52f42a Start to clean hook code 2013-07-09 21:40:45 +02:00
Laurent Destailleur
1bff25bf28 Start to clean hookmanager code. 2013-07-09 21:33:45 +02:00
Cédric Salvador
03ad72a1fa fix dol_buildpath failing when processing path such as file.php?id=__ID__ 2013-07-09 18:14:50 +02:00