Commit Graph

83885 Commits

Author SHA1 Message Date
Tobias Sekan
2d9300cedb
Add position to ODT supplier_proposal template 2020-02-24 15:06:21 +01:00
Tobias Sekan
fc76586e2f
Add position to ODT supplier order template 2020-02-24 15:05:04 +01:00
Tobias Sekan
1f2203f0d6
Add position to ODT propale template 2020-02-24 15:04:02 +01:00
Tobias Sekan
933b46790a
Add position to ODT mo template 2020-02-24 15:02:11 +01:00
Tobias Sekan
7469aa1f35
Add position to ODT invoice template 2020-02-24 15:00:37 +01:00
Tobias Sekan
cdbe6c1e81
Add position to ODT contract template 2020-02-24 14:59:20 +01:00
Tobias Sekan
b29d8e53ed
Add position to ODT order template 2020-02-24 14:58:01 +01:00
Tobias Sekan
4a5593e213
Add position to ODT for bom 2020-02-24 14:56:26 +01:00
Tobias Sekan
7baba2ba43
Add line number substitution 2020-02-24 14:55:02 +01:00
Laurent Destailleur
b55f6f8658 Fix css 2020-02-24 07:43:56 +01:00
Laurent Destailleur
58ebad4b15 Fix trans 2020-02-24 07:20:36 +01:00
Laurent Destailleur
8ebc157316 Test color magenta for titles 2020-02-24 06:55:08 +01:00
Laurent Destailleur
32d12468cf Use SVG logo instead of png 2020-02-24 06:27:03 +01:00
Laurent Destailleur
1cda54c1f3 CSS using the SVG 2020-02-24 06:16:50 +01:00
Laurent Destailleur
457d0668c8 Look and feel v12 2020-02-24 05:23:34 +01:00
Laurent Destailleur
a9155d020a css 2020-02-24 05:04:43 +01:00
Laurent Destailleur
150d4d33f6 Fix showing bank account on PDF 2020-02-24 04:55:09 +01:00
Laurent Destailleur
5c2fe5f780 Fix migration 2020-02-24 03:06:50 +01:00
Laurent Destailleur
f0d04d22e9 Disable stale on PR 2020-02-24 02:28:45 +01:00
Laurent Destailleur
47c5013f96 Try to use the version in Dolibarr/stale 2020-02-24 01:37:44 +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
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
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
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