Commit Graph

445 Commits

Author SHA1 Message Date
Laurent Destailleur
4208964153 Merge branch 'develop' into patch-10 2021-10-06 16:09:54 +02:00
Laurent Destailleur
329bc331db Merge pull request #18899 from fappels/14_fix_espadon
FIX fatal error on expedition espadon model
2021-10-06 13:29:47 +02:00
Laurent Destailleur
b4cfe35138 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-05 13:39:46 +02:00
Laurent Destailleur
b11dbf069e FIX Bad use of a forced contact of another company on PDF/ODT documents 2021-10-05 13:11:54 +02:00
Francis Appels
d3cbda08dc Fix fatal error 2021-10-04 22:12:50 +02:00
Laurent Destailleur
20e681d025 Revert "[NEW] PDF Document ref in title option" 2021-08-28 20:59:12 +02:00
Laurent Destailleur
f2f3c5daf5 Merge pull request #18373 from bb2a/PDF_Ref_In_Title
[NEW] PDF Document ref in title option
2021-08-28 20:41:55 +02:00
stickler-ci
3598e0a246 Fixing style errors. 2021-08-28 07:32:07 +00:00
henrynopo
4ae29c53aa Update pdf_espadon.modules.php 2021-08-28 15:30:05 +08:00
Christian Foellmann
f094b4c70c fix up most of the remaining submit inputs 2021-08-24 17:04:17 +02:00
Anthony Berton
58b50d02c7 default ref in title 2 2021-08-19 16:43:35 +02:00
Anthony Berton
10c445cf6a default ref in title 2021-08-19 16:13:41 +02:00
Anthony Berton
fcdb4bfafb Merge branch 'develop' into PDF_Ref_In_Title 2021-08-18 08:43:20 +02:00
Laurent Destailleur
e8646c7919 Merge branch 'develop' into PDF_Propal_frame_option 2021-08-17 18:30:37 +02:00
Laurent Destailleur
33697cec1c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2021-08-17 18:13:18 +02:00
Laurent Destailleur
8eba57f722 Merge branch 'develop' into PDF_Option_show_code_client 2021-08-17 16:51:01 +02:00
Laurent Destailleur
9c78f8f647 Merge branch 'develop' into PDF_Ref_In_Title 2021-08-17 16:46:06 +02:00
Laurent Destailleur
27a580dc95 Merge branch 'develop' into PDF_show_sender_name 2021-08-17 16:41:19 +02:00
Laurent Destailleur
1a8ad5abfa Propagate $outputlangs to getExtrafieldContent method. 2021-08-17 15:50:28 +02:00
Laurent Destailleur
310b5c974b Fix help 2021-08-11 19:43:12 +02:00
Anthony Berton
956bd00c13 CHANGE_CONST_ADD_DOC 2021-08-11 18:37:13 +02:00
Anthony Berton
fb42e3f473 add_doc 2021-08-11 18:25:48 +02:00
Anthony Berton
a8562704cf add_doc 2021-08-11 18:16:53 +02:00
Anthony Berton
e89c1b49a8 add_espadon_doc 2021-08-11 17:44:40 +02:00
Anthony Berton
c5e8302ba2 Const 2021-08-11 16:18:16 +02:00
Anthony Berton
40329b9181 other_doc 2021-08-11 12:59:34 +02:00
Anthony Berton
967d526307 other_frame 2021-08-11 12:41:50 +02:00
Anthony Berton
b8ccbf39f3 other_doc 2021-08-11 12:39:24 +02:00
Anthony Berton
b45a57060f const_and_other_doc 2021-08-11 12:36:16 +02:00
Anthony Berton
816648f283 other_docs 2021-08-11 12:28:44 +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