Commit Graph

65929 Commits

Author SHA1 Message Date
Laurent Destailleur
84050c888f Fix set of civility label 2019-04-11 18:04:18 +02:00
Laurent Destailleur
9337e48072
Merge branch 'develop' into patch-147 2019-04-11 17:54:29 +02:00
ptibogxiv
42b1ab10d1
Update contact.class.php 2019-04-11 17:04:40 +02:00
ptibogxiv
1f017d4d06
Update contact.class.php 2019-04-11 17:03:07 +02:00
Laurent Destailleur
b8d3110266
Merge pull request #10916 from frederic34/patch-2
Update EBP export
2019-04-11 16:56:16 +02:00
Laurent Destailleur
d975522659
Merge pull request #10999 from ptibogxiv/patch-149
Fix: only display stripe customer if customer
2019-04-11 16:35:21 +02:00
Laurent Destailleur
8079a389f8
Merge pull request #10992 from altatof/faccard2
NEW : retrieve invoice infos from order when billing shipment
2019-04-11 16:34:42 +02:00
Laurent Destailleur
7db0c0c705
Merge pull request #10993 from altatof/presend
NEW : use outputlangs in fullname construction for emails
2019-04-11 16:33:07 +02:00
Laurent Destailleur
f2fd07d824
Merge pull request #10991 from altatof/faccard
NEW constant KEEP_DISCOUNT_LINES_FROM_ORIGIN
2019-04-11 16:31:37 +02:00
Laurent Destailleur
4f87018c33
Update card.php 2019-04-11 16:31:13 +02:00
Laurent Destailleur
2ccd7b06c9
Merge pull request #10989 from altatof/faclist
NEW : add payment terms to invoices list
2019-04-11 16:29:41 +02:00
Laurent Destailleur
3d5a1a5550
Merge pull request #10988 from OPEN-DSI/new-societe-export-fields
New company fields in contact export
2019-04-11 16:29:01 +02:00
Laurent Destailleur
2b2838058c
Merge pull request #10986 from grandoc/new_branch_09_04_2019
New branch 09 04 2019
2019-04-11 16:28:18 +02:00
Laurent Destailleur
21add55d2b
Merge pull request #10985 from andreubisquerra/master
Add form class and fix autoprint with Takepos connector
2019-04-11 16:26:55 +02:00
Laurent Destailleur
ad5b95b912
Merge pull request #10995 from atm-john/FIX_menu_photo
Fix menu photo
2019-04-11 16:26:25 +02:00
Laurent Destailleur
cb08bf6021 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/class/product.class.php
2019-04-11 16:25:33 +02:00
Laurent Destailleur
54b3acc997 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/product/class/product.class.php
2019-04-11 16:23:56 +02:00
Laurent Destailleur
8fa8d7fa08 FIX Combo list was limited to 20 in stock correction 2019-04-11 16:13:44 +02:00
Laurent Destailleur
be004c16c6 FIX Combo list was limited to 20 in stock correction 2019-04-11 16:13:23 +02:00
ptibogxiv
ab172e30ad
only display stripe customer if customer 2019-04-11 16:11:00 +02:00
Laurent Destailleur
a3782f7060 Transifex sync 2019-04-11 16:08:50 +02:00
gauthier
9a24007c0a FIX : better test 2019-04-11 15:32:50 +02:00
gauthier
524b186959 FIX : Product accountancey sell intra code must be visible if main feature level 1 2019-04-11 15:19:40 +02:00
Laurent Destailleur
64759e4116 CSS 2019-04-11 13:04:54 +02:00
ATM john
f245247db6 Fix crtl+z and frenetic commit 2019-04-10 22:43:06 +02:00
ATM john
98681c51f1 Fix login dropdown menu no photo 2019-04-10 22:39:30 +02:00
Laurent Destailleur
6b4dbc80e5 Fix phpcs 2019-04-10 21:25:37 +02:00
Laurent Destailleur
862917edff NEW Tooltip with vat amount and price incl tax on lines of objects. 2019-04-10 21:24:23 +02:00
Laurent Destailleur
05ae0c370f Fix bad property set 2019-04-10 17:59:22 +02:00
Laurent Destailleur
203cbd56c2 Finished debug of emailcollector module 2019-04-10 17:35:33 +02:00
Laurent Destailleur
621709ed42 FIX check thirdparty defined when PROJECT_THIRDPARTY_REQUIRED is set 2019-04-10 16:54:20 +02:00
Laurent Destailleur
cfa414b2de Better log 2019-04-10 16:42:45 +02:00
Laurent Destailleur
4f2a3d6bdd Debug ticket module 2019-04-10 16:23:16 +02:00
Laurent Destailleur
05c14e4f2f Look and feel v10 2019-04-10 15:54:29 +02:00
Laurent Destailleur
2eeb4b8734 Debug ticket module 2019-04-10 15:45:55 +02:00
Laurent Destailleur
6a846f46f2 Debug module ticket 2019-04-10 15:33:15 +02:00
Laurent Destailleur
26594fab98 Debug module ticket 2019-04-10 15:11:38 +02:00
Laurent Destailleur
1f6f6f6edb Track action close for ticket 2019-04-10 13:21:06 +02:00
Laurent Destailleur
ed00391428 Fix debug ticket module 2019-04-10 12:43:26 +02:00
Laurent Destailleur
5e363e936c Fix debug ticket module 2019-04-10 12:35:27 +02:00
Laurent Destailleur
bb4da33fac Add picto for BOM 2019-04-10 11:49:43 +02:00
Laurent Destailleur
ac25003d33 Dolibarize module ticket 2019-04-10 11:39:54 +02:00
Christophe Battarel
79beb59385 use outputlangs in fullname construction for emails 2019-04-10 11:11:41 +02:00
Christophe Battarel
46e398f3d3 NEW : retrieve invoice infos from order when billing shipment 2019-04-10 10:50:01 +02:00
Christophe Battarel
b04296984d NEW constant KEEP_DISCOUNT_LINES_FROM_ORIGIN 2019-04-10 10:29:17 +02:00
Laurent Destailleur
2765cee005 CSS 2019-04-09 19:36:56 +02:00
Laurent Destailleur
861c1b412c CSS 2019-04-09 19:23:34 +02:00
Christophe Battarel
5f9f615e11 fix form_conditions_reglement parameters 2019-04-09 18:37:36 +02:00
Christophe Battarel
790c5f493a fix select_conditions parameters 2019-04-09 18:32:00 +02:00
Christophe Battarel
01255602d8 fix select_conditions parameters 2019-04-09 18:30:58 +02:00