lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
102,103 Commits 43 Branches 150 Tags 886 MiB
scrutinizer-patch-2
Commit Graph

90157 Commits

Author SHA1 Message Date
Laurent Destailleur
90c12ae340 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-24 16:37:42 +02:00
Laurent Destailleur
07ab352877 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/list.php
 2021-08-24 16:37:18 +02:00
Laurent Destailleur
5b7fb9a4bb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-08-24 16:36:39 +02:00
Laurent Destailleur
ba594b20e0 Fix phpcs 2021-08-24 16:36:27 +02:00
lvessiller
a4a44faa7f FIX change LOG_DEBUG with LOG_WARNING in syslog and remove sql error in syslog (already done) 2021-08-24 16:21:55 +02:00
Erik van Berkum
a0dc6ca394 Fix: TechnicalID displayed 2 times in both MO and BOM the PR hides 1. Adjusted visible to -2 2021-08-24 23:12:04 +09:00
Christian Foellmann
227f61a711 replace remaining SubmitCancel buttons 2021-08-24 16:10:20 +02:00
Erik van Berkum
79903470fc
Merge branch 'Dolibarr:develop' into develop 2021-08-24 22:58:03 +09:00
Laurent Destailleur
9752819fe3
Merge pull request #18342 from atm-gauthier/NEW_shpping_method_and_trackingurl_on_shipping_list 
NEW : display shipping method and tracking url on shipment list
 2021-08-24 15:54:21 +02:00
Laurent Destailleur
76c3f10842
Merge pull request #18438 from aspangaro/15a4 
NEW Supplier order - Add From/to input on search date
 2021-08-24 15:53:15 +02:00
Laurent Destailleur
02a0e44f07
Merge pull request #18440 from aspangaro/15a5 
NEW Contract - Add From/to input on search date
 2021-08-24 15:52:47 +02:00
Laurent Destailleur
1c665c34cd
Merge pull request #18485 from fappels/14_fix_supplier_order_card 
Fix warning on supplier order card when reception enabled.
 2021-08-24 15:31:05 +02:00
Laurent Destailleur
96fed159ec
Merge pull request #18450 from frederic34/patch-8 
make public url more readable
 2021-08-24 15:30:08 +02:00
Laurent Destailleur
8aa262f302
Merge pull request #18453 from aspangaro/14p15 
FIX #18353 Invoice list translation issue
 2021-08-24 15:29:32 +02:00
Laurent Destailleur
e0fd8b5eb8 Simplify code 2021-08-24 15:28:59 +02:00
Laurent Destailleur
22339a3ed3
Merge pull request #18451 from cfoellmann/PR/form-buttons-function 
improve forms - buttonsSaveCreate()
 2021-08-24 15:26:03 +02:00
Laurent Destailleur
2d870d0f81
Merge branch '14.0' into 14p10 2021-08-24 15:15:38 +02:00
henrynopo
73c0471ead Fix error of supplier invoice (variable amount) 
This update fixed the coding error for addline of deposit invoice for variable amount.

In addition, there is no invoice template for supplier invoice, so I also corrected the respective description.
 2021-08-24 15:12:15 +02:00
Laurent Destailleur
c3fe1bfdc0
Merge pull request #18459 from henrynopo/patch-9 
Fix error of supplier invoice (variable amount)
 2021-08-24 15:09:53 +02:00
Laurent Destailleur
15da97f1da Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/compta/facture/card.php
	htdocs/product/price.php
 2021-08-24 15:05:14 +02:00
Laurent Destailleur
591059847e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/price.php
 2021-08-24 15:00:35 +02:00
Laurent Destailleur
67baa48c16 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/fourn/facture/list.php
 2021-08-24 14:56:13 +02:00
Laurent Destailleur
6fa5930e8d Fix label must not be translated 2021-08-24 14:54:46 +02:00
Laurent Destailleur
b10f75932f
Merge pull request #18466 from aspangaro/14p16 
FIX Supplier invoice list - Wrong language key used
 2021-08-24 14:51:46 +02:00
Laurent Destailleur
169282c82b
Merge pull request #18458 from andreubisquerra/develop 
NEW Split Sale in TakePOS
 2021-08-24 14:51:08 +02:00
Laurent Destailleur
1a56fdad22 Fix type 2021-08-24 14:48:53 +02:00
Laurent Destailleur
b6d74be5cd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-24 14:48:08 +02:00
Laurent Destailleur
465c9bf287 NEW Introduce method hasRight 2021-08-24 14:47:50 +02:00
Laurent Destailleur
8b2c82dd23 Fix position of fields 2021-08-24 14:27:18 +02:00
Alexandre SPANGARO
efb78d7431 FIX Invoice list - Wrong name for column total_tva 2021-08-24 14:22:36 +02:00
Alexandre SPANGARO
7b829bc899 FIX Field already present in SQL request 2021-08-24 14:22:21 +02:00
Laurent Destailleur
4a32788bff
Merge pull request #18463 from aspangaro/14p14 
FIX Invoice list - Wrong name for column total_tva
 2021-08-24 14:20:57 +02:00
Laurent Destailleur
f93e899c0f
Merge pull request #18472 from FHenry/dev_php8 
fix: php 8 warning
 2021-08-24 14:18:29 +02:00
Laurent Destailleur
9816dff00a
Merge pull request #18480 from henrynopo/patch-11 
Fix - Supplier deposit invoice - auto convert to discount (error)
 2021-08-24 14:09:39 +02:00
Laurent Destailleur
c6774505d8 FIX #18465 2021-08-24 14:05:02 +02:00
Laurent Destailleur
1cfe165613 Better name for field 2021-08-24 13:34:10 +02:00
Laurent Destailleur
366fa13fc0 NEW Add property "copytoclipboard" in modulebuilder 2021-08-24 13:19:53 +02:00
henrynopo
3c1bdd163f
Update paiementfourn.class.php 2021-08-24 18:34:34 +08:00
Francis Appels
edeaa6009f Fix warning on supplier order card when reception enabled. 2021-08-24 10:48:26 +02:00
lvessiller
4efe2a0e09 FIX invoice fetch not found syslog debug level instead of error 2021-08-24 08:20:40 +02:00
Laurent Destailleur
56c314c671 Fix translation 2021-08-24 00:32:20 +02:00
Laurent Destailleur
a6ddc90d5b Fix responsive 2021-08-23 23:53:58 +02:00
Laurent Destailleur
3419e43a2c Fix phpunit 2021-08-23 21:02:07 +02:00
Laurent Destailleur
dc006b0ebb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2021-08-23 19:44:02 +02:00
Laurent Destailleur
7af023665f Clean var not defined 2021-08-23 19:37:11 +02:00
Laurent Destailleur
8485fee5f9 Cast numeric into on sql request 2021-08-23 19:33:24 +02:00
Laurent Destailleur
23829ae637 Cast numeric into on sql request 2021-08-23 18:56:46 +02:00
Florian HENRY
4dc542acad fix: php 8 warning 2021-08-23 18:29:04 +02:00
Laurent Destailleur
6d5329bbf8 Fix phpunit 2021-08-23 17:45:16 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Laurent Destailleur
4460206709 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-23 16:04:16 +02:00
Laurent Destailleur
edb239837c FIX #yogosha6944 Protection against traversal path. 2021-08-23 16:03:34 +02:00
Laurent Destailleur
d46dfd017a FIX #yogosha6944 Protection against traversal path. 2021-08-23 16:00:03 +02:00
Laurent Destailleur
21852bd16b Show link to invoices on member record 2021-08-23 15:25:41 +02:00
Alexandre SPANGARO
a0378549b8 FIX Accountancy - Some problems of length with general & subledger account 2021-08-23 15:19:27 +02:00
Laurent Destailleur
5f16de8150 Code comment 2021-08-23 15:08:29 +02:00
Laurent Destailleur
a25346e302 FIX Date of payment of subscription must not be set to 1970-01-01. 
Fix look and feel v14
 2021-08-23 15:00:29 +02:00
Laurent Destailleur
983d7e5177 FIX Add option $noescapecommand in executeCLI for better compatibility 2021-08-23 12:26:16 +02:00
Laurent Destailleur
041784876d Fix option $nolog 2021-08-23 12:25:59 +02:00
Laurent Destailleur
227f01b000 Fix can add a redirection into the executeCLI method. 2021-08-23 12:25:48 +02:00
Laurent Destailleur
fdffc0c13a NEW Add param $nolog to avoid logging into dol_delete_recursive_dir() 2021-08-23 12:25:29 +02:00
Laurent Destailleur
b0817e132f FIX Add option $noescapecommand in executeCLI for better compatibility 2021-08-23 12:19:16 +02:00
Laurent Destailleur
8c017b9406 Sanitize $ and ; for filesystem path (like files). 2021-08-23 12:18:04 +02:00
Laurent Destailleur
cced15e50a Fix option $nolog 2021-08-23 11:58:14 +02:00
Laurent Destailleur
eec5fba333 Fix can add a redirection into the executeCLI method. 2021-08-23 11:51:08 +02:00
Laurent Destailleur
34c1991730 NEW Add param $nolog to avoid logging into dol_delete_recursive_dir() 2021-08-23 11:32:25 +02:00
Philippe GRAND
7c2d19ffaf FIX : indentation 2021-08-23 10:20:22 +02:00
Laurent Destailleur
0325b68bfb Fix missing autoselect 2021-08-23 10:17:36 +02:00
Philippe GRAND
f88fdbe71d FIX : for php8 compliance 2021-08-23 10:12:28 +02:00
Philippe GRAND
7baf98dbfa fix : Undefined property: Conf:: in C:\wamp64\www\dolibarr-140\htdocs\core\class\html.form.class.php on line 7957 2021-08-22 23:15:36 +02:00
Alexandre SPANGARO
b5a4c58106 FIX Supplier invoice list - Wrong language key used 2021-08-22 22:42:40 +02:00
Philippe GRAND
ba9ede39bf fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\htdocs\comm\propal\card.php on line 265 2021-08-22 22:28:53 +02:00
Philippe GRAND
e439e0f14d fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\htdocs\product\class\propalmergepdfproduct.class.php on line 251 2021-08-22 21:55:00 +02:00
Philippe GRAND
16f2a53fb8 fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\htdocs\product\class\propalmergepdfproduct.class.php on line 236 2021-08-22 21:52:57 +02:00
Philippe GRAND
538b2e2a5f fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\htdocs\core\class\commonobject.class.php on line 1705 2021-08-22 19:47:06 +02:00
Laurent Destailleur
d3de81fecb Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/holiday/card.php
	htdocs/holiday/class/holiday.class.php
 2021-08-22 19:34:13 +02:00
Laurent Destailleur
53a6e0cfaf Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-08-22 19:23:56 +02:00
Laurent Destailleur
fe17c13a5f FIX an approved holiday can be canceled by an admin. 2021-08-22 19:22:47 +02:00
Alexandre SPANGARO
56c23b79e0 FIX Invoice list - Wrong name for column total_tva 2021-08-22 14:02:33 +02:00
Alexandre SPANGARO
dd51e24afc FIX Field already present in SQL request 2021-08-22 14:01:29 +02:00
Philippe GRAND
2e3b9fce49 fix : Undefined array key 4 in C:\wamp64\www\dolibarr-140\htdocs\core\class\extrafields.class.php on line 1721 2021-08-22 12:18:26 +02:00
Philippe GRAND
6619099be9 fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\htdocs\core\actions_builddoc.inc.php on line 69 2021-08-22 12:05:30 +02:00
Philippe GRAND
665dfb48e4 fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\htdocs\comm\propal\card.php on line 125 2021-08-22 11:40:32 +02:00
henrynopo
b4096dc057
Fix error of supplier invoice (variable amount) 
This update fixed the coding error for addline of deposit invoice for variable amount.

In addition, there is no invoice template for supplier invoice, so I also corrected the respective description.
 2021-08-22 13:26:46 +08:00
Laurent Destailleur
ff3f85b214 Fix case sensitive 2021-08-22 01:44:52 +02:00
Laurent Destailleur
58fa0740c3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/langs/en_US/errors.lang
 2021-08-22 01:41:18 +02:00
Laurent Destailleur
e6fa070c84 Fix phpcs 2021-08-22 01:21:31 +02:00
Laurent Destailleur
4cd5a53b63 FIX Recommended session.cookie_samesite must be 'Lax' not 'Strict'. 2021-08-22 00:44:51 +02:00
andreubisquerra
a6bdff59c9
Update lang 2021-08-21 22:31:54 +02:00
andreubisquerra
c4075605da
CSS 2021-08-21 22:31:03 +02:00
andreubisquerra
fc06c557c2
New split.php 2021-08-21 22:30:13 +02:00
andreubisquerra
f020a7dba2
Update index.php 2021-08-21 22:29:18 +02:00
Christian Foellmann
3f895f7dc5 correct codestyle 2021-08-21 19:57:52 +02:00
Christian Foellmann
7ca490088a fix codestyle issues 2021-08-21 19:51:31 +02:00
Laurent Destailleur
49f6a634d0 Fix output of error message. br is no more encoded 2021-08-21 15:00:47 +02:00
Laurent Destailleur
ac5b16fd01 Fix lang 2021-08-21 13:41:04 +02:00
Laurent Destailleur
04a922b5f4 Implement the noescapetags into dol_escape_htmltag 2021-08-21 13:27:33 +02:00
Laurent Destailleur
17213ae65d More error messages on paypal payment. 2021-08-21 12:37:28 +02:00
Laurent Destailleur
68d24661db Try to fix the ' that show ' on PDF 2021-08-21 12:19:50 +02:00
Laurent Destailleur
bdf8c3ddc6 Fix test 2021-08-20 23:26:56 +02:00
Alexandre SPANGARO
af843ed82c Merge branch '14.0' into 14p10 2021-08-20 22:11:42 +02:00
Alexandre SPANGARO
53af4b0076 FIX #18375 SQL Error on tasks statistics 2021-08-20 22:11:26 +02:00
Alexandre SPANGARO
8bdf58b942 FIX #18353 Invoice list translation issue 2021-08-20 21:42:43 +02:00
Laurent Destailleur
35e48f3a27 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-08-20 21:12:22 +02:00
Laurent Destailleur
9d285ea232 Fix: Can delete a price when date is in future to fix corrupted data 2021-08-20 21:11:20 +02:00
Frédéric FRANCE
e93dbcd0c0
make public url more readable 2021-08-20 14:47:51 +02:00
Christian Foellmann
d706c3b1ec use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination 2021-08-20 14:41:30 +02:00
Laurent Destailleur
335e1ff405 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-20 12:45:37 +02:00
Laurent Destailleur
10ddd621ca Fix escape error message 2021-08-20 12:40:49 +02:00
Anthony Berton
019241e3d4 Merge branch 'PDF_Ref_In_Title' of https://github.com/bb2a/dolibarr into PDF_Ref_In_Title 2021-08-19 18:17:10 +02:00
Anthony Berton
f50842cdef cop 2021-08-19 18:16:58 +02:00
stickler-ci
c750c5f7cf Fixing style errors. 2021-08-19 14:45:55 +00:00
Anthony Berton
58b50d02c7 default ref in title 2 2021-08-19 16:43:35 +02:00
Anthony Berton
10c445cf6a default ref in title 2021-08-19 16:13:41 +02:00
Laurent Destailleur
03d2d24244 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-08-19 16:12:26 +02:00
Laurent Destailleur
e1dc5b5188 css 2021-08-19 16:12:13 +02:00
Laurent Destailleur
91792e3c0e
Merge pull request #18441 from KlaasOl/patch-4 
Update main.lang
 2021-08-19 13:48:12 +02:00
Laurent Destailleur
3ee4a6556a
Merge branch 'develop' into undefined 2021-08-19 13:43:32 +02:00
stickler-ci
172b672437 Fixing style errors. 2021-08-19 10:19:25 +00:00
Gurvan Kervern
476dfc289e
Update index.php 2021-08-19 18:16:47 +08:00
Erik van Berkum
e570c22398 Fix: TechnicalID displayed 2 times in both MO and BOM the PR hides 1. 2021-08-19 17:09:18 +09:00
Florian HENRY
223637317b fix: missing tocken CRCSF 2021-08-19 09:51:09 +02:00
Klaas Oldenburger
0d4badb50b
Update main.lang 
Change date format to Dutch standards
 2021-08-19 08:26:37 +02:00
Alexandre SPANGARO
954676b04b NEW Contract - Add From/to input on search date 2021-08-19 04:47:08 +02:00
Laurent Destailleur
eb70cb2ecc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-19 02:49:24 +02:00
Alexandre SPANGARO
797372cac2 NEW Supplier order - Add From/to input on search date 2021-08-18 22:30:33 +02:00
Gurvan Kervern
4d20ba2e4e
Update services_list.php 2021-08-19 04:29:09 +08:00
Laurent Destailleur
e0f8a87129 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-18 22:15:39 +02:00
Laurent Destailleur
60c9a882f1 Code comment 2021-08-18 22:15:20 +02:00
Laurent Destailleur
7af265db8a
Update card.php 2021-08-18 22:03:16 +02:00
Laurent Destailleur
1df2aeb233
Update card.php 2021-08-18 22:01:53 +02:00
Laurent Destailleur
c9128fa59c
Merge pull request #18436 from aspangaro/15a3 
NEW Supplier proposal - Add From/to input on search date
 2021-08-18 22:00:23 +02:00
Alexandre SPANGARO
c03b71dff3 NEW Supplier proposal - Add From/to input on search date 2021-08-18 21:41:11 +02:00
Laurent Destailleur
79f9b30f29
Merge pull request #18409 from vincentjdc/product-generate-ref-after-form 
NEW : Allows product ref generation after the form is validated with PRODUCT_GENERATE_REF_AFTER_FORM
 2021-08-18 21:32:35 +02:00
Laurent Destailleur
fa3ba05a23
Update card.php 2021-08-18 21:31:54 +02:00
Laurent Destailleur
cec94b5f33
Merge pull request #18433 from aspangaro/15a2 
NEW Ihm admin - Add tabs
 2021-08-18 21:30:41 +02:00
Laurent Destailleur
c2bfc87c34
Merge pull request #18435 from henrynopo/patch-2 
Added China into the list of country using State / province in address
 2021-08-18 21:28:16 +02:00
Laurent Destailleur
13e64d2f79 Fix replace file_get_contents with getURLContent 2021-08-18 19:46:37 +02:00
Laurent Destailleur
ee6a2f73db css install 2021-08-18 19:32:07 +02:00
Laurent Destailleur
e4aafcf91e Code comment 2021-08-18 18:43:33 +02:00
henrynopo
526ea1a9b3
Added China into the list of country using State / province in address 2021-08-18 22:30:28 +08:00
stickler-ci
88b0408e42 Fixing style errors. 2021-08-18 13:57:19 +00:00
Gurvan Kervern
ab95c5f463
Update index.php 2021-08-18 21:55:00 +08:00
Gurvan Kervern
2d35106e0b
Update card.php 2021-08-18 17:52:21 +08:00
Gurvan Kervern
3cde9a27ab
Update list.php 2021-08-18 17:50:10 +08:00
Gurvan Kervern
66495f3a9d
Update services_list.php 2021-08-18 17:47:59 +08:00
Gurvan Kervern
9253034007
Update list.php 2021-08-18 17:43:45 +08:00
stickler-ci
b51ac49f90 Fixing style errors. 2021-08-18 07:15:05 +00:00
vincentjdc
dc037083ae
Merge branch 'develop' into product-generate-ref-after-form 2021-08-18 09:13:01 +02:00
Anthony Berton
fcdb4bfafb
Merge branch 'develop' into PDF_Ref_In_Title 2021-08-18 08:43:20 +02:00
stickler-ci
062e665874 Fixing style errors. 2021-08-18 02:45:29 +00:00
Alexandre SPANGARO
73dc98ed82 NEW Ihm admin - Add tabs 2021-08-18 04:36:37 +02:00
Laurent Destailleur
ae3a0fce71 Fix phpcs 2021-08-18 02:16:30 +02:00
Laurent Destailleur
b95b233c4b Position of fields 2021-08-18 02:07:48 +02:00
Laurent Destailleur
82db3ae1a9 NEW Use lang selector when using a field key 'lang' in modulebuilder 2021-08-18 01:54:13 +02:00
Laurent Destailleur
3bc8a7345c
Merge branch 'develop' into develop#1 2021-08-18 00:37:23 +02:00
Laurent Destailleur
04ce50c6f3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-18 00:15:05 +02:00
Laurent Destailleur
4d9fc36ff2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-18 00:14:55 +02:00
Laurent Destailleur
57c9649b50 FIX bad approver shown on holiday once approved 2021-08-18 00:12:25 +02:00
Laurent Destailleur
33b9787ea1 Clean code 2021-08-18 00:10:48 +02:00
Laurent Destailleur
da3fb82868
Merge pull request #18175 from defrance/patch-170 
FIX : "disabled" field missing on definition
 2021-08-17 23:34:34 +02:00
Laurent Destailleur
c001fb9555 Clean code 2021-08-17 23:23:15 +02:00
Laurent Destailleur
bbcea38793 Fix phpcs 2021-08-17 21:58:06 +02:00
Alexandre SPANGARO
a7cb9b2143 NEW Ihm admin - Add tabs 2021-08-17 21:29:15 +02:00
Laurent Destailleur
1ff6c33276
Merge pull request #17537 from kastoras/create_share_on_file_upload_with_other_setup 
New Add option MAIN_FORCE_SHARING_ON_ANY_UPLOADED_FILE to share file on any file upload
 2021-08-17 20:11:54 +02:00
stickler-ci
5d0318c98f Fixing style errors. 2021-08-17 18:11:12 +00:00
Laurent Destailleur
659f24efa9
Update files.lib.php 2021-08-17 20:10:47 +02:00
Laurent Destailleur
9521a9e77f Clean code 2021-08-17 20:02:19 +02:00
Laurent Destailleur
aee291d079
Merge pull request #17865 from ATM-Consulting/NEW_develop_autocomplete_accounting_account_groups 
New develop autocomplete accounting account groups
 2021-08-17 19:46:46 +02:00
Laurent Destailleur
dafb3b5029
Update global.inc.php 2021-08-17 19:41:42 +02:00
Laurent Destailleur
59c9c48844
Merge branch 'develop' into new_validation_method_for_common_object 2021-08-17 19:35:36 +02:00
Laurent Destailleur
84073c6373
Merge branch 'develop' into patch-169 2021-08-17 19:31:30 +02:00
Laurent Destailleur
2a19c02f19
Merge pull request #18178 from defrance/patch-171 
PHP V8 warning error, use of not declared array
 2021-08-17 19:29:49 +02:00
Laurent Destailleur
f0f8210918
Update DolibarrModules.class.php 2021-08-17 19:28:26 +02:00
Laurent Destailleur
35ebaf7b79
Merge pull request #18282 from aspangaro/12p18 
FIX: Manage credit note on situation invoice for calculate margin
 2021-08-17 19:26:16 +02:00
Laurent Destailleur
5d70ce4f99
Merge pull request #18310 from Hystepik/develop#2 
Close #18302 : Mass action leave requests aproval
 2021-08-17 19:23:30 +02:00
Laurent Destailleur
cbdf121215
Merge branch 'develop' into dev_2 2021-08-17 19:20:42 +02:00
Laurent Destailleur
4f29a01da4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 19:12:21 +02:00
Laurent Destailleur
e264163ab6 Fix phpcs 2021-08-17 19:11:48 +02:00
Laurent Destailleur
95721d36ab
Merge pull request #17687 from FHenry/dev_massaction_paid_custom_invoice 
NEW : mass action paid customer invoice
 2021-08-17 19:10:49 +02:00
Laurent Destailleur
794db94178
Update list.php 2021-08-17 19:08:55 +02:00
Laurent Destailleur
f38b9eb1c4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 19:02:29 +02:00
Laurent Destailleur
47b4fd3769 Complete migration 2021-08-17 19:02:16 +02:00
Laurent Destailleur
b96dd7a796
Merge branch 'develop' into patch-422 2021-08-17 19:00:46 +02:00
Laurent Destailleur
0858487119 Fix #18343 2021-08-17 18:52:33 +02:00
Laurent Destailleur
a19f8cd87d
Merge pull request #18337 from atm-maxime/fix_holidays_users 
Fix : we only want employee users for holidays
 2021-08-17 18:37:38 +02:00
Laurent Destailleur
ec2df3b282
Update pdf.php 2021-08-17 18:33:10 +02:00
Laurent Destailleur
e8646c7919
Merge branch 'develop' into PDF_Propal_frame_option 2021-08-17 18:30:37 +02:00
Laurent Destailleur
16c290f735
Merge pull request #18383 from marc-dll/12.0_FIX_invoice_tiny_negative_vat 
FIX: invoice validation: when checking if any VAT rate has a negative amount, prevent false positives with -1.0E-14 amounts
 2021-08-17 18:24:33 +02:00
Laurent Destailleur
d09c2de6a8 Better position of options 2021-08-17 18:18:08 +02:00
Laurent Destailleur
33697cec1c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2021-08-17 18:13:18 +02:00
Laurent Destailleur
fb1e5f72d3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 18:11:08 +02:00
Laurent Destailleur
ae28dad72e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 18:08:40 +02:00
Laurent Destailleur
955e9de1b7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/product/reassortlot.php
	htdocs/product/stock/product.php
	htdocs/product/stock/productlot_card.php
	htdocs/reception/card.php
 2021-08-17 18:07:10 +02:00
Laurent Destailleur
ceaaff0186 Sellby always before Eatby #18361 2021-08-17 18:05:34 +02:00
Laurent Destailleur
c0a086fad8 Sellby always before Eatby #18361 2021-08-17 17:55:00 +02:00
Laurent Destailleur
d1858e02b5
Update card.php 2021-08-17 17:03:41 +02:00
Laurent Destailleur
d4c35edef4
Update pdf.php 2021-08-17 16:55:56 +02:00
Laurent Destailleur
8eba57f722
Merge branch 'develop' into PDF_Option_show_code_client 2021-08-17 16:51:01 +02:00
Laurent Destailleur
9c78f8f647
Merge branch 'develop' into PDF_Ref_In_Title 2021-08-17 16:46:06 +02:00