Commit Graph

102271 Commits

Author SHA1 Message Date
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
b3043ab3d6 Fix phpunit 2021-08-22 01:20:25 +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
Laurent Destailleur
b52ad0500b Removed useless files 2021-08-20 16:25:51 +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
henrynopo
0933b6c39f
Update html.form.class.php 2021-08-20 20:04:53 +08: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
henrynopo
b2252106c3
Added function - using list of location_incoterms
Added function to call for list of location_incoterms from the existing order records or table of location_incoterms.

Accordingly, an dditional ajex file namely "locationincoterms.php" and a database table namely c_location_incoterms are required.
2021-08-20 10:43:34 +08: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
c20d61029c
Merge pull request #18442 from FHenry/fix_14_tokenCRSCF
fix: missing token CRCSF
2021-08-19 13:46:31 +02:00
Laurent Destailleur
0d0b147261
Merge pull request #18424 from GurvanKervern/undefined
Undefined
2021-08-19 13:43:57 +02:00