Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
102,972 Commits 36 Branches 189 Tags
0c52817426af4b82b51a06101dfc83f2c5e0855a
Commit Graph

25432 Commits

Author SHA1 Message Date
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
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
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
f93e899c0f Merge pull request #18472 from FHenry/dev_php8 
fix: php 8 warning
 2021-08-24 14:18:29 +02:00
Laurent Destailleur
366fa13fc0 NEW Add property "copytoclipboard" in modulebuilder 2021-08-24 13:19:53 +02:00
Laurent Destailleur
a6ddc90d5b Fix responsive 2021-08-23 23:53:58 +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
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
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
d46dfd017a FIX #yogosha6944 Protection against traversal path. 2021-08-23 16:00:03 +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
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
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
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
Alexandre SPANGARO
a1d3e21e77 NEW IHM - Include new options to manage dashboard 2021-08-22 05:25:13 +02: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
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
04a922b5f4 Implement the noescapetags into dol_escape_htmltag 2021-08-21 13:27:33 +02:00
Laurent Destailleur
68d24661db Try to fix the ' that show ' on PDF 2021-08-21 12:19:50 +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
jpb
a3bae451d5 Merge branch 'NEW_field_in_service_object' of github.com:atm-jpb/dolibarr into NEW_field_in_service_object 2021-08-20 14:06:43 +02:00
jpb
ed65bca666 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_field_in_service_object 2021-08-20 14:06:13 +02:00
jpb
d9a07acfa3 remove duplicate code 2021-08-20 14:05:22 +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
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
eb70cb2ecc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-19 02:49:24 +02:00