Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
60,834 Commits 36 Branches 189 Tags
c16cb15ce30ba644f33f01e32b273677007c8044
Commit Graph

11886 Commits

Author SHA1 Message Date
Laurent Destailleur
185b865d83 Merge pull request #7060 from defrance/patch-18 
TPL refactoring
 2017-08-17 22:36:06 +02:00
Laurent Destailleur
dcc6822c3c Merge pull request #7056 from defrance/patch-17 
Refactoring tpl Folder
 2017-08-17 22:34:47 +02:00
Laurent Destailleur
4d46b2ae58 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/filefunc.inc.php
 2017-08-17 22:21:30 +02:00
Laurent Destailleur
744f0ab198 Merge remote-tracking branch 'origin/5.0' into 6.0 2017-08-17 22:03:26 +02:00
Laurent Destailleur
0dd5bcde40 Merge pull request #7135 from apachler/develop 
NEW Added functionality to get order customer contact as contact_xx tags
 2017-08-17 18:28:23 +02:00
Laurent Destailleur
d95a39b191 Merge pull request #7245 from fappels/develop_supplier_order_PDF_pictures 
New show product picture in supplier proposals
 2017-08-17 18:23:45 +02:00
Juanjo Menent
3330f040ba FIX: Bad tax calculation with expense report 2017-08-16 11:19:28 +02:00
Laurent Destailleur
d37d1a033a Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/compta/bank/bankentries.php
	htdocs/core/lib/admin.lib.php
	htdocs/install/mysql/migration/repair.sql
 2017-08-11 19:56:17 +02:00
Laurent Destailleur
54b8fff0d8 Merge pull request #7241 from atm-florian/dev_manageextrafieldswithmultientity 
fix : Better management for exstrafeild management
 2017-08-10 13:01:51 +02:00
fappels
34153eec7f Add reading of picture paths 2017-08-07 22:36:12 +02:00
fappels
7fc359df5d Fix pic position when VAT column hidden 2017-08-07 21:48:01 +02:00
fappels
3ef4b0fd2b Add pictures to pdf muscadet 2017-08-07 21:47:45 +02:00
fappels
ea5dcbf611 Fix constant to show pics and remove pics column line 2017-08-07 21:35:30 +02:00
Laurent Destailleur
fd38a55f51 FIX amount overlap other amount when a pagebreak is done due to an image 
at the bottom of page.
 2017-08-07 15:49:54 +02:00
Laurent Destailleur
975fd0a6d3 Fix font size 2017-08-07 15:43:42 +02:00
Laurent Destailleur
66ffc9ca47 Debug modulebuilder 2017-08-05 11:44:27 +02:00
Laurent Destailleur
180b7d3c11 Debug modulebuilder 2017-08-05 11:35:42 +02:00
Laurent Destailleur
1c157c7c3d Fix pb with mix collation. Add a way to fix this in repair. 2017-08-04 21:23:40 +02:00
florian HENRY
f6a1e7685c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_manageextrafieldswithmultientity 2017-08-04 17:13:53 +02:00
florian HENRY
03e935f493 Better management 2017-08-04 17:11:40 +02:00
Laurent Destailleur
1bd992dae9 Merge pull request #7238 from atm-florian/dev_manageextrafieldswithmultientity 
NEW : manageme extrafields with multientity
 2017-08-04 15:39:31 +02:00
Laurent Destailleur
402e6bf650 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/various_payment/card.php
	htdocs/compta/bank/various_payment/index.php
	htdocs/compta/paiement/list.php
	htdocs/core/modules/modCron.class.php
 2017-08-04 15:39:00 +02:00
Laurent Destailleur
7c840b8348 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-08-04 15:32:30 +02:00
Laurent Destailleur
a7dda865c9 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-08-04 15:29:54 +02:00
Laurent Destailleur
a3beceade2 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-08-04 15:28:55 +02:00
Laurent Destailleur
8a71b9e95e Avoid creation of dir that is not indexed 2017-08-04 13:51:25 +02:00
Laurent Destailleur
da831d2c8e FIX Bad link in ECM 2017-08-04 13:45:57 +02:00
Laurent Destailleur
5b7c144f95 FIX Bad link in ECM 2017-08-04 13:45:20 +02:00
Laurent Destailleur
c107a77722 NEW Can filter on document name in ECM module for automatic tree 2017-08-04 13:10:51 +02:00
Laurent Destailleur
3a098ca047 Reduce verbosity 2017-08-04 11:50:30 +02:00
florian HENRY
8fd45383e2 NEW : manageme extrafields with multientity 2017-08-04 09:00:11 +02:00
Laurent Destailleur
f058fa1938 Better detection if a module provide triggers 2017-08-03 12:19:31 +02:00
Laurent Destailleur
00a1893d93 Better help 2017-08-03 12:04:13 +02:00
Laurent Destailleur
8cd2235b4b Start to introduce cron for email reminder. 2017-08-03 11:42:22 +02:00
Laurent Destailleur
a8e2f95c39 Better help 2017-08-03 10:47:35 +02:00
Laurent Destailleur
81b11100b0 Prepare code to clone site an fetch external page 2017-08-03 01:45:31 +02:00
Laurent Destailleur
fa752348c8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/various_payment/index.php
	htdocs/contact/list.php
	htdocs/langs/en_US/errors.lang
 2017-08-02 17:56:09 +02:00
Laurent Destailleur
2a92ee6008 Fix look and feel v6 2017-08-02 14:10:43 +02:00
Laurent Destailleur
5b1f5b0f20 Fix translation done twice into field title of array 2017-08-02 13:31:53 +02:00
Laurent Destailleur
33d6903d3f Fix bad recipient when using mass actions 2017-08-02 11:39:11 +02:00
Ferran Marcet
09c271b7c5 Fix: Correction in the calculation of the next week 2017-08-02 10:31:16 +02:00
Laurent Destailleur
71d49f1c6f Fix pb in ecm 2017-08-01 18:44:34 +02:00
Laurent Destailleur
f9dc628f0b Add tool to fix missing thumbs 2017-08-01 15:53:22 +02:00
Laurent Destailleur
03b3f54c2c Fix class not found 2017-08-01 13:10:15 +02:00
Laurent Destailleur
b6a7ce6822 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-01 10:22:37 +02:00
Laurent Destailleur
ba221650cf Start to work on using the jquery date selector. 2017-08-01 01:25:30 +02:00
Laurent Destailleur
7d6d4adcdb Fix combo for multicompany not visible where there is other hooks by 
other modules
 2017-07-31 18:16:41 +02:00
Laurent Destailleur
9cf6c43f8a Fix code comment 2017-07-31 15:51:08 +02:00
Laurent Destailleur
7ba5cf5958 Debug view of services lines 2017-07-31 13:48:00 +02:00
Laurent Destailleur
800aa4d5b6 Fix bad target 2017-07-31 04:49:54 +02:00