Commit Graph

219 Commits

Author SHA1 Message Date
Laurent Destailleur
d0f22c7bff Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/boxes/box_graph_product_distribution.php
2020-03-06 14:22:42 +01:00
Laurent Destailleur
d4b67a6cef Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/contrat/list.php
	htdocs/core/lib/functions.lib.php
2020-03-06 14:19:30 +01:00
kamel
0123fa7696 FIX subsitute lines dates values on doc generator (ODT, ...) 2020-03-05 15:37:01 +01:00
Laurent Destailleur
f0d458682d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-29 00:15:17 +01:00
Laurent Destailleur
e35bba358f Fix error when generating documents 2020-02-29 00:13:42 +01:00
Tobias Sekan
7baba2ba43 Add line number substitution 2020-02-24 14:55:02 +01:00
Laurent Destailleur
ca39c680c7 Rename field documentpdf into printable (this field already exists due
to a very old PR nofinished for same goal).
2020-02-23 23:03:17 +01:00
stickler-ci
222a000d31 Fixing style errors. 2020-02-23 14:27:22 +00:00
ATM john
8a279ed124 improve extrafields display in notes 2020-02-23 15:24:59 +01:00
ATM john
679e2fd186 Merge branch '12.0_new_allow_extrafields_on_pdf' of github.com:atm-john/dolibarr into 12.0_new_allow_extrafields_on_pdf 2020-02-23 11:36:06 +01:00
ATM john
fe4e00b139 Add new params to extrafields forms to allow extrafields to be displayed on pdf documents 2020-02-23 11:32:38 +01:00
stickler-ci
d575188d80 Fixing style errors. 2020-02-23 09:11:58 +00:00
ATM john
ff6dc735ee fix extrafield conf cache 2020-02-23 10:09:47 +01:00
stickler-ci
281e059487 Fixing style errors. 2020-02-23 01:28:30 +00:00
ATM john
8c36dd0ad8 add extrafields in notes 2020-02-23 02:26:21 +01:00
stickler-ci
2b027cfebf Fixing style errors. 2020-02-22 15:45:39 +00:00
ATM john
e209fd2973 Add extrafields on PDF object lines 2020-02-22 16:27:44 +01:00
Laurent Destailleur
fdfc45bbe9 Fix wrapping 2020-02-05 15:04:11 +01:00
Laurent Destailleur
4598538b42 Prepare PDF templates to use 2 languages for titles 2020-01-21 01:55:00 +01:00
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:39 +00:00
Laurent Destailleur
6f82c212a0 Finished migration to the new architecture of extrafields 2019-11-02 17:38:19 +01:00
Laurent Destailleur
496f93911f Merge pull request #11821 from Tim-Otte/develop
NEW Extrafields support in product supplier prices
2019-11-02 16:19:13 +01:00
Laurent Destailleur
c4be61c55c FIX Better compatible fix for the trouble of weight / size units
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/card.php
2019-10-22 18:42:59 +02:00
Laurent Destailleur
e7e9898e0d FIX Better compatible fix for the trouble of weight / size units 2019-10-22 18:36:36 +02:00
Laurent Destailleur
b88968520b Move code of extrafields to the new architecture 2019-10-22 17:08:37 +02:00
Tim Otte
ad51e862e4 Merged 2019-10-22 11:39:32 +02:00
Tim Otte
ceb3482204 Requested changes implemented 2019-10-22 11:36:28 +02:00
Laurent Destailleur
8ce6197314 Update commondocgenerator.class.php 2019-10-20 14:37:15 +02:00
Frédéric FRANCE
e75f7d448c Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Frédéric FRANCE
9f59656589 fix typo inspired by grandoc 2019-10-11 23:08:33 +02:00
Philippe Grand
bcb7365a5a Update commondocgenerator.class.php 2019-10-11 10:13:21 +02:00
Philippe GRAND
af88f44fd9 fix some translations 2019-10-11 09:51:17 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
stickler-ci
a8e73533b9 Fixing style errors. 2019-09-27 13:43:11 +00:00
Tim Otte
10f7bd3494 Restricted query of ExtraFields for supplier orders 2019-09-27 15:42:57 +02:00
Tim Otte
b673c88fab Fixed sql error 2019-09-25 10:25:00 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Tim Otte
8f4b2436e4 Ooops 2019-09-10 09:13:42 +02:00
Tim Otte
0c68a7b0e6 Possible solution for the problem "SELECT * is forbidden by SQL rules" 2019-09-10 09:11:31 +02:00
Tim Otte
54d0b94b6d Added extrafield support to the product supplier price lines 2019-09-04 15:13:42 +02:00
Laurent Destailleur
3c80bc139e Merge pull request #11794 from atm-florian/10_fixMissingSubstitutionCheckbox
FIX bad substitution for extrafields type checkbox
2019-09-03 15:18:17 +02:00
florian HENRY
c8bfc7441e fix avoid error message Divided By 0 2019-09-02 09:44:59 +02:00
florian HENRY
7dc3684662 fix bad substitution for extrafields type checkbox 2019-09-02 09:41:30 +02:00
Laurent Destailleur
d01b54ca5b Fix phpcs 2019-04-08 18:02:27 +02:00
Laurent Destailleur
1274d71a10 Fix phpcs 2019-04-08 16:00:01 +02:00
John BOTELLA
a668cc28b1 Add table title auto height 2019-04-03 16:19:49 +02:00
Laurent Destailleur
51eab7e2f8 Fix rename tag 2019-03-19 15:21:07 +01:00
Laurent Destailleur
9745bd1f16 NEW Add tag for ODT generation for localtax rates 2019-03-19 15:18:43 +01:00
Frédéric FRANCE
c89e4d79b8 wip 2019-02-25 22:27:04 +01:00
Frédéric FRANCE
894123fb06 PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket 2019-02-24 20:06:55 +01:00