Commit Graph

82621 Commits

Author SHA1 Message Date
Laurent Destailleur
fe537fb2fc
Fix MVC 2021-01-19 12:14:54 +01:00
Anthony Berton
bb1af10cf1 warehouse thirparty affect on proposal or order 2021-01-17 16:48:51 +01:00
stickler-ci
93b421238a Fixing style errors. 2021-01-17 01:26:09 +00:00
Anthony Berton
89ac5e8803 1 2021-01-17 02:09:21 +01:00
Anthony Berton
daf472b781 Update card.php 2021-01-17 00:15:32 +01:00
Laurent Destailleur
a4109d3fd0
Merge pull request #15600 from Hystepik/develop#2
Close #15384 : New widget stat database
2021-01-16 18:42:50 +01:00
Laurent Destailleur
b4be544350
Merge pull request #15978 from bb2a/tel_on_list_users
NEW Add column "Office phone" and  "User mobile" in user list
2021-01-16 18:06:19 +01:00
Laurent Destailleur
87d16c56e7
Merge pull request #15977 from frederic34/TotalAmountOfdirectDebitOrderDiffersFromSumOfLines
add missing translation
2021-01-16 17:28:20 +01:00
Laurent Destailleur
fdeb2d2f9c
Merge pull request #15979 from frederic34/patch-8
member has ref now
2021-01-16 17:26:52 +01:00
Laurent Destailleur
d67e0621dd
Merge pull request #15994 from andreubisquerra/develop
FIX Avoid php errors if negative var in Receipt Module
2021-01-16 17:25:40 +01:00
Laurent Destailleur
cdcc6b7324
Merge pull request #15974 from frederic34/davadmin
fix trans
2021-01-16 17:13:37 +01:00
Laurent Destailleur
ba51e67477
Merge pull request #15981 from bb2a/phone_picto_on_liste
Add picto phone and url on thirparty and contact list
2021-01-16 17:00:33 +01:00
Laurent Destailleur
bb6ea8a6cb
Merge pull request #15984 from frederic34/patch-14
fix merge
2021-01-16 17:00:12 +01:00
Laurent Destailleur
c5e6fb30fb
Merge pull request #15993 from andreubisquerra/develop
Fix special chars in free text with TakePOS
2021-01-16 16:53:00 +01:00
Laurent Destailleur
d00eb5b533
Merge pull request #15989 from zuiko/patch-3
Fix #15820 Bug: Unable to edit the pricing in Sales Order
2021-01-16 16:50:49 +01:00
Laurent Destailleur
e5c932d3f4
Update functions.lib.php 2021-01-16 16:50:34 +01:00
Laurent Destailleur
d592a5d669 Trans 2021-01-16 16:47:38 +01:00
Laurent Destailleur
329499c103 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-16 16:43:00 +01:00
Laurent Destailleur
992645c13d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-16 16:35:13 +01:00
Laurent Destailleur
871691bf69 Fix missing popup 2021-01-16 16:34:49 +01:00
Laurent Destailleur
2f69a380be Fix syntax error 2021-01-16 16:06:49 +01:00
Laurent Destailleur
04e669ec96 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/langs/fr_FR/other.lang
2021-01-16 15:38:34 +01:00
Laurent Destailleur
892bd432e4 Fix crop of image on invoices. 2021-01-16 15:35:15 +01:00
Laurent Destailleur
064b00e979 Sync transifex 2021-01-16 15:33:47 +01:00
Laurent Destailleur
68302d74ba Fix look and feel v14 2021-01-16 14:10:37 +01:00
Frédéric FRANCE
216da52972
Merge remote-tracking branch 'upstream/develop' into patch-8 2021-01-16 14:00:05 +01:00
Laurent Destailleur
4864808e4d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formmail.class.php
2021-01-16 13:45:34 +01:00
Laurent Destailleur
b3d7783a29 Fix multicompany compatibility of preview of file in email form 2021-01-16 13:41:27 +01:00
Laurent Destailleur
820ab1a110 Better error message 2021-01-16 13:03:34 +01:00
Laurent Destailleur
c7c74e8ed1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/fourn/facture/card.php
2021-01-15 19:53:46 +01:00
Laurent Destailleur
2c0f6d2984 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/ticket/list.php
2021-01-15 19:49:25 +01:00
Laurent Destailleur
7d37183f21 FIX Pb with VAT code when VAT code contains a number 2021-01-15 19:43:02 +01:00
andreubisquerra
2f9f933ea8
FIX Avoid php errors if negative var in Receipt Module 2021-01-15 19:28:12 +01:00
Laurent Destailleur
d36c406074 Code comment 2021-01-15 19:24:53 +01:00
Laurent Destailleur
80ed651c5e Fix GETPOST 2021-01-15 19:23:56 +01:00
andreubisquerra
b6d8a81ae8
Fix special chars in free text with TakePOS
Sending the description with the post method avoid chars problems
2021-01-15 18:12:55 +01:00
Laurent Destailleur
ea266c1f2d Fix missing alias 2021-01-15 17:59:08 +01:00
Laurent Destailleur
6d455352a3 Restore change for test 2021-01-15 17:47:39 +01:00
Laurent Destailleur
32bd194f8e Sort array 2021-01-15 17:47:14 +01:00
Laurent Destailleur
4b66f6bcd3 Restrict list to customer and supplier only
Merge 2 sql request in to 1
2021-01-15 17:43:54 +01:00
Laurent Destailleur
8cef8df33a Hide advanced feature with ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY 2021-01-15 17:35:16 +01:00
Laurent Destailleur
0e636031ba Add option
MAIN_USE_VAT_OF_PRODUCT_FOR_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID
2021-01-15 16:07:00 +01:00
Laurent Destailleur
9350774808 Add option
MAIN_USE_VAT_OF_PRODUCT_FOR_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID
2021-01-15 16:06:22 +01:00
Laurent Destailleur
62a5c8b6da FIX Bad balance of begin commit 2021-01-15 15:34:24 +01:00
Laurent Destailleur
8e1128ef10 FIX Bad balance of begin commit 2021-01-15 15:33:12 +01:00
Laurent Destailleur
2970dc2151 Fix warning 2021-01-15 15:14:23 +01:00
Laurent Destailleur
c778eafc4a Fix very slow effect. 2021-01-15 14:54:23 +01:00
Laurent Destailleur
ba37396af2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-15 14:36:32 +01:00
Laurent Destailleur
82cedd9fd2 Fix filter 2021-01-15 14:36:02 +01:00
Laurent Destailleur
e8ed6a9f09 Trans 2021-01-15 14:33:26 +01:00