Commit Graph

83841 Commits

Author SHA1 Message Date
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
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
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
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
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
0d474b2ec9 CSS 2020-02-22 14:20:42 +01:00
Laurent Destailleur
d741a025f3 Fix duplicate error message 2020-02-22 14:13:15 +01:00
Laurent Destailleur
1d34ef213c Fix error management 2020-02-22 12:19:46 +01:00
ATM john
aa77d96f23 remove IDE warnings 2020-02-22 12:06:21 +01:00
javierybar
fddcc844ff Add orders to Receipt Printers module 2020-02-22 11:30:48 +01:00
futurehousestore
16b4e680f7 Add Products/Services by popularity in Orders 2020-02-22 02:45:58 +00:00
gmilad
6264f78e39
Update note.php
Bonsoir,
Correction pour l'issue #13168
Cordialement,
Gaëtan.
2020-02-21 23:01:16 +01:00
Laurent Destailleur
18533b635a CSS 2020-02-21 20:30:28 +01:00
Laurent Destailleur
1dbf3a7ae8 Look and feel v11 2020-02-21 20:14:55 +01:00
Laurent Destailleur
9e9c3f2285
Merge pull request #13164 from mapiolca/patch-36
#NEW Add ELDY DARK MODE
2020-02-21 20:13:00 +01:00
Laurent Destailleur
9a6d6852f6
Merge branch 'develop' into patch-36 2020-02-21 20:12:29 +01:00
Laurent Destailleur
a33040350a Merge branch 'mapiolca-patch-36' into develop 2020-02-21 20:09:01 +01:00
Pierre Ardoin
86c6c922ce
Fix wrong global name 2020-02-21 20:07:09 +01:00
Laurent Destailleur
af76cd4387 Fix bad var 2020-02-21 20:05:06 +01:00
Laurent Destailleur
0aa4ee9d40
Merge branch 'develop' into patch-36 2020-02-21 19:54:15 +01:00
Laurent Destailleur
2492188de3
Merge pull request #12501 from c3do/patch-3
NEW API to update purchase price. NEW Can force ref of a variant product
2020-02-21 19:48:22 +01:00
Laurent Destailleur
badc4327c2
Merge branch 'develop' into patch-3 2020-02-21 19:45:33 +01:00
Laurent Destailleur
c2677c0231
Update api_products.class.php 2020-02-21 19:44:02 +01:00
Laurent Destailleur
e485a68e74
Merge pull request #13156 from andreubisquerra/master
Move printer preferencies to print tab in TakePOS
2020-02-21 18:20:45 +01:00
Laurent Destailleur
e4b00c5c20
Merge branch 'develop' into master 2020-02-21 18:20:10 +01:00
Laurent Destailleur
4d3111ea4d
Merge pull request #13159 from oscim/patch-22
Update emailcollector.class.php
2020-02-21 18:18:37 +01:00
Laurent Destailleur
0ec4294d96
Update emailcollector.class.php 2020-02-21 18:15:31 +01:00
Laurent Destailleur
c0098188af
Merge pull request #13154 from frederic34/patch-7
fix workflow with multicurrency
2020-02-21 18:12:27 +01:00
Laurent Destailleur
7907e85f60
Merge pull request #13153 from bb2a/patch-16
MAJ MAIN_FIRST_TO_UPPER LOW first uppercase letter of a lowercase chain
2020-02-21 18:11:45 +01:00
Laurent Destailleur
efcc3443ad
Merge pull request #13155 from indelog/fix-modoristomouv
Fix: Mouvementstock::get_origin modulenme whith origintype
2020-02-21 18:05:23 +01:00
Laurent Destailleur
58a57a0411
Merge branch 'develop' into fix-modoristomouv 2020-02-21 18:05:13 +01:00
Laurent Destailleur
964b8d74f6
Merge pull request #13160 from frederic34/patch-8
avoid warning if not an array
2020-02-21 17:58:50 +01:00
Laurent Destailleur
9b9f6d5da4
Merge pull request #13151 from frederic34/patch-6
fix CATEGORY_ADD_DESC_INTO_DOC
2020-02-21 17:55:19 +01:00