Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
101,561 Commits 36 Branches 189 Tags
b1cba14718f901b459681a56ee7a9f58ffdd18ab
Commit Graph

416 Commits

Author SHA1 Message Date
Laurent Destailleur
310b5c974b Fix help 2021-08-11 19:43:12 +02:00
Laurent Destailleur
25c6b64b1e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/modules/delivery/doc/pdf_storm.modules.php
	htdocs/core/modules/reception/doc/pdf_squille.modules.php
	htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
	htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
 2021-06-29 15:58:26 +02:00
Francis Appels
ec805d36fe Remove deprecated level parameter. 2021-06-25 10:02:23 +02:00
Francis Appels
dc9e71084b Fix missing posYAfterImage for nexy for espadon and squille 2021-06-24 12:15:29 +02:00
Francis Appels
d20bd5bcf6 fix ctrl-y 2021-06-24 10:18:21 +02:00
Francis Appels
09382e0505 FIX #17919 pictures in docs. 
Supplier order and proposal worked for me.
Supplier invoice not implemented need new feature request.
 2021-06-24 10:12:34 +02:00
Philippe GRAND
0d60323e41 internationalization 2021-06-20 11:13:31 +02:00
Philippe GRAND
e2ef205036 internationalization 2021-06-20 11:11:41 +02:00
Laurent Destailleur
e3e2dfd764 Fix generation of ODT (test if temporary directory is writable) 2021-06-20 05:11:46 +02:00
Laurent Destailleur
8b9af8f5ab Responsive 2021-06-13 01:27:04 +02:00
Laurent Destailleur
3ad8827c8a Clean code 2021-05-09 20:17:17 +02:00
Laurent Destailleur
6e32efdb40 Fix phpcs 2021-05-03 20:22:36 +02:00
Laurent Destailleur
9973085613 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/comm/propal/card.php
	htdocs/compta/bank/releve.php
	htdocs/compta/paiement/rapport.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/reception/card.php
	htdocs/societe/societecontact.php
 2021-05-03 19:36:49 +02:00
Florian HENRY
a7b093ed81 FIX: Espadon PDF shippment model with long public note now wroking 2021-04-29 11:34:09 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
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