ATM john
|
9c1fdf1c52
|
Fix missing php doc
|
2020-02-24 22:12:36 +01:00 |
|
ATM john
|
3e492b8a5b
|
Fix title padding
|
2020-02-24 22:08:04 +01:00 |
|
ATM john
|
ae890d021c
|
Fix comments
|
2020-02-24 21:50:01 +01:00 |
|
ATM john
|
7f2dd19bb0
|
Fix pdf cell padding for model cyan, erathosthene, espadon, cornas
|
2020-02-24 21:43:33 +01:00 |
|
stickler-ci
|
6de74e774e
|
Fixing style errors.
|
2020-02-24 19:50:07 +00:00 |
|
ATM john
|
3c4e7f7b07
|
Fix cell padding sponge
|
2020-02-24 20:47:19 +01:00 |
|
John Botella
|
11b6cae4f1
|
Merge branch '12.0_new_allow_extrafields_on_pdf_extend_to_line_desc' of github.com:atm-john/dolibarr into 12.0_new_allow_extrafields_on_pdf_extend_to_line_desc
|
2020-02-24 17:48:42 +01:00 |
|
John Botella
|
1ca1f0677b
|
fix PDF cell padding
|
2020-02-24 17:48:01 +01:00 |
|
stickler-ci
|
d07e2ab8fb
|
Fixing style errors.
|
2020-02-24 16:44:46 +00:00 |
|
John Botella
|
06b2d459c0
|
Fix cell padding
|
2020-02-24 14:18:49 +01:00 |
|
John Botella
|
98407347e7
|
Update extrafield printable desc
|
2020-02-24 13:44:26 +01:00 |
|
ATM john
|
377b9a6b88
|
Add extrafields on PDF object lines desc for compatible pdf
|
2020-02-24 00:14:43 +01:00 |
|
ATM john
|
41c18a7884
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_allow_extrafields_on_pdf_extend_to_line_desc
|
2020-02-24 00:01:50 +01:00 |
|
Laurent Destailleur
|
096a568e83
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/extrafields.class.php
|
2020-02-23 23:42:23 +01:00 |
|
stickler-ci
|
fab34d5114
|
Fixing style errors.
|
2020-02-23 22:40:41 +00:00 |
|
ATM john
|
e46ba38785
|
Merge branch '12.0_new_allow_extrafields_on_pdf_extend_to_line_desc' of github.com:atm-john/dolibarr into 12.0_new_allow_extrafields_on_pdf_extend_to_line_desc
|
2020-02-23 23:38:17 +01:00 |
|
Laurent Destailleur
|
3075e40f8c
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/comm/remx.php
htdocs/core/boxes/box_contacts.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/security.lib.php
|
2020-02-23 23:37:46 +01:00 |
|
ATM john
|
0c2d08cdd9
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_allow_extrafields_on_pdf_extend_to_line_desc
|
2020-02-23 23:36:43 +01:00 |
|
Laurent Destailleur
|
5919570b34
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2020-02-23 23:31:51 +01:00 |
|
Laurent Destailleur
|
11ff3f6562
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2020-02-23 23:31:03 +01:00 |
|
Laurent Destailleur
|
530930b7aa
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2020-02-23 23:30:38 +01:00 |
|
Laurent Destailleur
|
ee45c3efb6
|
FIX #13184
|
2020-02-23 23:29:13 +01:00 |
|
stickler-ci
|
33f3083f70
|
Fixing style errors.
|
2020-02-23 22:26:27 +00:00 |
|
ATM john
|
acacbfd85e
|
Fix list separator on first loop
|
2020-02-23 23:17:10 +01:00 |
|
ATM john
|
316fa4068a
|
revert commit fdfc45bbe9 and fix y position
|
2020-02-23 23:14:01 +01:00 |
|
ATM john
|
5ecef88b35
|
allow in extrafield conf to choose to add extrafield in a new col or append it to description, it could be useful for html or long text extrafields
|
2020-02-23 23:04:24 +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 |
|
Laurent Destailleur
|
90565e4637
|
Merge pull request #13179 from atm-john/12.0_new_allow_extrafields_on_pdf
NEW allow display extrafields on pdf
|
2020-02-23 22:55:16 +01:00 |
|
Laurent Destailleur
|
f931b92d36
|
Merge branch 'new-takepos-batch-decrement' of
https://github.com/OPEN-DSI/dolibarr into develop
# Conflicts:
# htdocs/langs/en_US/errors.lang
|
2020-02-23 22:49:03 +01:00 |
|
Laurent Destailleur
|
d1de562674
|
Merge pull request #13172 from futurehousestore/productlist2
Add Products/Services by popularity in Orders
|
2020-02-23 22:46:07 +01:00 |
|
Laurent Destailleur
|
ac2f6bdc42
|
Merge pull request #13178 from gmilad/patch-2
Update note.php
|
2020-02-23 22:45:00 +01:00 |
|
Laurent Destailleur
|
1381d0aa38
|
Merge pull request #13169 from gmilad/patch-1
Update note.php
|
2020-02-23 22:44:39 +01:00 |
|
Laurent Destailleur
|
cac61c223d
|
Merge pull request #13176 from andreubisquerra/master
Add orders to Receipt Printer module
|
2020-02-23 22:44:14 +01:00 |
|
Laurent Destailleur
|
5648205beb
|
Merge pull request #13181 from atm-maxime/8.0
Fix #10179 discount split
|
2020-02-23 22:43:21 +01:00 |
|
Laurent Destailleur
|
686a93769c
|
Fix delay before closing stale issues
|
2020-02-23 22:30:15 +01:00 |
|
Laurent Destailleur
|
189c0d675b
|
Fix memory report. Xdebug no more required. Try = null instead of unset.
|
2020-02-23 22:05:59 +01:00 |
|
Laurent Destailleur
|
76e33058a8
|
NEW Can select several fields to personalize list before submit.
|
2020-02-23 21:38:24 +01:00 |
|
ATM john
|
93c9f07cb9
|
Fix note x position
|
2020-02-23 20:59:04 +01:00 |
|
ATM john
|
f611e4fc0e
|
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 20:53:50 +01:00 |
|
ATM john
|
07bd6e1fc0
|
Fix On admin page add extrafields form, display on pdf option doesn't saved
|
2020-02-23 20:52:44 +01:00 |
|
Maxime Kohlhaas
|
0ab16ed5ae
|
Fix #10179 discount split
|
2020-02-23 16:50:24 +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 |
|
ATM john
|
60b3d9d4db
|
Add extrafields on PDF object lines for compatible pdf
|
2020-02-22 18:07:15 +01:00 |
|