Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
96,016 Commits 36 Branches 189 Tags
0127a3bedb51f05f32f11c23fe9a2398ad1c7e21
Commit Graph

401 Commits

Author SHA1 Message Date
Rüdiger Hahn
18fc169cd0 Don't discard previously collected data 
For keeping all previously collected data (i.e. company_... values), one has to merge the array but not to assign a new one.
 2021-03-05 11:32:03 +01:00
Frédéric FRANCE
a4e25359e7 add missing rule 2021-03-01 20:37:16 +01:00
Frédéric FRANCE
554e449e40 code syntax core directory 2021-02-23 22:03:23 +01:00
Philippe GRAND
e638c238c6 Save the name of generated file as the main doc when generating a doc with this template 2021-02-05 17:54:51 +01:00
Philippe GRAND
7c13428456 Save the name of generated file as the main doc when generating a doc with this template 2021-02-05 17:53:34 +01:00
Philippe GRAND
c03da95acb Save the name of generated file as the main doc when generating a doc with this template 2021-02-05 17:52:12 +01:00
Laurent Destailleur
71278b173e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-06 20:28:33 +01:00
Laurent Destailleur
654cf2d990 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2021-01-06 20:27:46 +01:00
stickler-ci
ca557cfacd Fixing style errors. 2021-01-06 13:22:35 +00:00
quentin
e44b14364a FIX useless tracking number displayed on pdf if empty 2021-01-06 14:17:06 +01:00
Laurent Destailleur
9c759e91f0 Fix debug management of docs in ticket module 2020-12-16 19:01:26 +01:00
Laurent Destailleur
d1c66059cd Add missing tag order_ref and order_ref_customer on shipments for ODT 
generation.

Conflicts:
	htdocs/core/class/commondocgenerator.class.php
 2020-12-06 19:03:46 +01:00
Laurent Destailleur
025cbe8557 Add missing tag order_ref and order_ref_customer on shipments for ODT 
generation.
 2020-12-06 19:01:09 +01:00
Laurent Destailleur
1ec3d4cfdf CSS 2020-12-03 13:19:35 +01:00
Laurent Destailleur
46171a6ec8 Fix option MAIN_USE_COMPANY_NAME_OF_CONTACT 2020-12-02 21:27:15 +01:00
Laurent Destailleur
beafcc7853 Fix warning 2020-11-29 16:06:03 +01:00
Laurent Destailleur
147a12a922 Fix warning 2020-11-28 15:02:05 +01:00
Laurent Destailleur
df461d319e Fix warning 2020-11-28 02:12:07 +01:00
Laurent Destailleur
9aa657bc35 Debug v13 2020-11-26 18:48:51 +01:00
Laurent Destailleur
c4094357c2 Merge pull request #15412 from frederic34/patch-21 
doxygen
 2020-11-15 17:05:03 +01:00
Laurent Destailleur
5c15162c40 Fix warning 2020-11-15 15:10:15 +01:00
Frédéric FRANCE
d6afdda8fe Update pdf_rouget.modules.php 2020-11-14 21:09:02 +01:00
Frédéric FRANCE
0b097c74fa Update pdf_merou.modules.php 2020-11-14 21:07:34 +01:00
Frédéric FRANCE
84ea018d81 doxygen 2020-11-14 21:05:53 +01:00
Laurent Destailleur
a168c3fbb1 Remove warnings 2020-11-12 12:33:29 +01:00
Laurent Destailleur
e0ed89c514 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/compta/facture/card.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/actions_addupdatedelete.inc.php
	htdocs/product/class/product.class.php
	htdocs/product/price.php
	htdocs/projet/tasks/time.php
 2020-11-01 17:58:41 +01:00
Laurent Destailleur
72160deef7 FIX #14979 2020-11-01 17:01:26 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Laurent Destailleur
ec6c735d89 Clean code 2020-10-27 19:44:15 +01:00
Scrutinizer Auto-Fixer
b78ff67d7e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-07 08:18:17 +00:00
Laurent Destailleur
aa422ce4d7 Merge branch 'develop' into develop 2020-08-07 12:05:32 +02:00
Laurent Destailleur
9320ba1b37 Merge pull request #14376 from grandoc/patch-3 
Update pdf_rouget.modules.php
 2020-08-07 11:41:28 +02:00
Philippe Grand
8483d4609c Update pdf_rouget.modules.php 
The comment should be TCPDF and not PDF
 2020-08-04 17:05:32 +02:00
Philippe Grand
7e519da8df Update pdf_merou.modules.php 
The comment should be TCPDF and not PDF
 2020-08-04 17:00:59 +02:00
Philippe Grand
d781a7cf62 Update pdf_espadon.modules.php 2020-08-04 16:00:12 +02:00
Philippe Grand
001662af3d Update pdf_rouget.modules.php 2020-08-04 15:49:47 +02:00
Philippe Grand
19fb6e827e Update pdf_merou.modules.php 2020-08-04 15:47:00 +02:00
Philippe Grand
f94d4413a9 Update pdf_espadon.modules.php 2020-08-04 15:45:52 +02:00
Philippe GRAND
8bdf15a6a6 Change comment to fixe a lot of undefined method 2020-08-03 09:28:25 +02:00
Philippe GRAND
83d1ff2a6c Change comment to fixe a lot of undefined method 2020-08-03 09:25:17 +02:00
Philippe GRAND
0b75280104 Change comment to fixe a lot of undefined method 2020-08-03 09:19:55 +02:00
Philippe GRAND
d4562a91ff Minimum version of PHP required by module 2020-07-11 15:03:38 +02:00
Philippe GRAND
7f5ebf2e31 Minimum version of PHP required by module 2020-07-11 14:35:36 +02:00
Laurent Destailleur
c8d0476728 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
 2020-06-01 04:09:52 +02:00
Laurent Destailleur
dbac97a908 Fix several troubles into numbering modules. 
Prefix for takepos moved from TK to TC (TK was already used for tasks)
 2020-06-01 04:02:47 +02:00
Frédéric FRANCE
b41ac00b98 add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
ee6fadd0d5 add new rule 2020-05-21 01:41:27 +02:00
Scrutinizer Auto-Fixer
1bf5745286 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-25 11:52:07 +00:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
Laurent Destailleur
83af4ebea4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/product/stock/class/entrepot.class.php
	htdocs/product/stock/list.php
 2020-04-10 01:22:22 +02:00