Commit Graph

73771 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
VESSILLER
73da62d842 NEW Add product on key "Enter" in search bar 2020-02-24 13:57:36 +01:00
oscim
6c7a534018
Update commonobject.class.php
Add support of project/projet in objectlinked
2020-02-24 11:49:12 +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
3682d9143e Fix showing bank account on PDF 2020-02-24 04:55:44 +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
4b4d1bcce2 Fix disable accountancy chart that is deprecated. 2020-02-24 03:05:58 +01:00
Laurent Destailleur
6366881f91 FIX #13175 2020-02-24 00:41:25 +01:00
Laurent Destailleur
090b0e90d2 FIX #13183 2020-02-23 23:52:48 +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
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
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
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
295d42b476 Fix trans of status 2020-02-22 14:19:23 +01:00
Laurent Destailleur
d741a025f3 Fix duplicate error message 2020-02-22 14:13:15 +01:00
gmilad
559fc9f61e
Update note.php
Fix : #13168
2020-02-22 13:07:25 +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
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
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
b4fdd9bc50
Merge pull request #13078 from hregis/10.0_mc
FIX #10309
2020-02-21 19:21:54 +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
Frédéric FRANCE
8d507c4f32 fix workflow with multicurrency 2020-02-21 18:12:48 +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
58a57a0411
Merge branch 'develop' into fix-modoristomouv 2020-02-21 18:05:13 +01:00
Frédéric FRANCE
327b827fb4 avoid warning if not an array
Conflicts:
	htdocs/projet/element.php
2020-02-21 18:01:04 +01:00
Frédéric FRANCE
f6eba36575 fix CATEGORY_ADD_DESC_INTO_DOC
$cate->add_category doesn't exists
2020-02-21 18:00:12 +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
Scrutinizer Auto-Fixer
e44865d8b5 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-21 16:53:37 +00:00
Laurent Destailleur
55bef402c4 Fix remove a lot of warnings on Eclipse 2020-02-21 17:47:36 +01:00
stickler-ci
7f9944afa7 Fixing style errors. 2020-02-21 16:42:18 +00:00
Pierre Ardoin
7457796a95
Add Dark mode 2020-02-21 17:38:10 +01:00
Pierre Ardoin
501728ce36
AD 2020-02-21 17:31:53 +01:00
Laurent Destailleur
ec09e7222d Fix remove a lot of warnings on Eclipse 2020-02-21 17:31:37 +01:00
Laurent Destailleur
7e4af04886 CSS For bookmark dropdown 2020-02-21 17:18:01 +01:00
Laurent Destailleur
60f394a53c Fix CSS for RTL languages 2020-02-21 17:07:22 +01:00
Laurent Destailleur
df1851838e Main language of a web site is now mandatory 2020-02-21 16:37:07 +01:00
Laurent Destailleur
ea19ab96c3 Fix compatibility with php 7.4 2020-02-21 14:46:02 +01:00
Laurent Destailleur
d3f8c7af1e Fix compatibility with php 7.4 2020-02-21 14:41:36 +01:00
Laurent Destailleur
be3ecb3093 Remove hidden constant MAIN_EXTRAFIELDS_IN_ONE_TD that was useless 2020-02-21 14:32:53 +01:00
Laurent Destailleur
89b7c8dfd6 NEW Can select which element to export in export accounting documents. 2020-02-21 14:20:05 +01:00
Laurent Destailleur
5243cee0b8 Fix duplicate field in insert 2020-02-21 13:48:05 +01:00
VESSILLER
ec19b2feef FIX phpcs nestling too high level 2020-02-21 12:00:16 +01:00
Laurent Destailleur
7909055ee8 Enhance multilangue support in website module 2020-02-21 11:36:16 +01:00
VESSILLER
71c9b94b22 NEW add const CASHDESK_FORCE_DECREASE_STOCK to force batch decrementation 2020-02-21 11:08:34 +01:00
Frédéric FRANCE
4801117c37
avoid warning if not an array 2020-02-21 09:24:24 +01:00
oscim
d255c95661
Update emailcollector.class.php
For support multiple () and select last () in result regex 
Sample: object.email=EXTRACT:BODY:E-mail(:([a-zA-Z0-9_@.-]*)\n|\r);
2020-02-21 09:04:24 +01:00
Laurent Destailleur
1f4b639ba0 Debug MRP module 2020-02-20 17:44:03 +01:00