Commit Graph

25147 Commits

Author SHA1 Message Date
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
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
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
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
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
henrynopo
526ea1a9b3
Added China into the list of country using State / province in address 2021-08-18 22:30:28 +08:00
Anthony Berton
fcdb4bfafb
Merge branch 'develop' into PDF_Ref_In_Title 2021-08-18 08:43:20 +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
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
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
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
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
4f29a01da4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 19:12:21 +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
0858487119 Fix #18343 2021-08-17 18:52:33 +02:00
Laurent Destailleur
e8646c7919
Merge branch 'develop' into PDF_Propal_frame_option 2021-08-17 18:30:37 +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
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
Laurent Destailleur
27a580dc95
Merge branch 'develop' into PDF_show_sender_name 2021-08-17 16:41:19 +02:00
Laurent Destailleur
a0d82e6bf7
Merge pull request #18404 from lainwir3d/add_url_shipment_substitute
CLOSE #18403 Add __URL_SHIPMENT__ substitute to get the shipment URL
2021-08-17 16:36:09 +02:00
Laurent Destailleur
582bf1415e
Update functions.lib.php 2021-08-17 16:35:43 +02:00
Laurent Destailleur
2035499a34
Merge pull request #18402 from lainwir3d/add_newref_substitute
CLOSE #18401 Add __NEWREF__ subtitute to get new object reference.
2021-08-17 16:34:11 +02:00
Laurent Destailleur
3e5deeadf4
Merge pull request #18406 from vincentjdc/supplier-order-hide-product-label
NEW : Adds PDF_HIDE_PRODUCT_LABEL_IN_SUPPLIER_LINES to hide product label in supplier order lines
2021-08-17 16:24:19 +02:00
Laurent Destailleur
284207aeb3
Merge pull request #18429 from atm-quentin/NEW_hook_after_rank_update
NEW hook after rank update
2021-08-17 16:15:44 +02:00
Laurent Destailleur
7986f4881c
Update commonobject.class.php 2021-08-17 16:12:45 +02:00
Laurent Destailleur
1a8ad5abfa Propagate $outputlangs to getExtrafieldContent method. 2021-08-17 15:50:28 +02:00
Laurent Destailleur
f18f970b08 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 13:52:36 +02:00
Laurent Destailleur
7d61609462 FIX #yogosha6907 2021-08-17 13:13:04 +02:00
Quentin VIAL-GOUTEYRON
5f4ab188cf NEW hook after rank update 2021-08-17 09:33:50 +02:00
Laurent Destailleur
92d6ad9597 Removed old simple POS module ('cashdesk' module) 2021-08-17 04:57:53 +02:00
Laurent Destailleur
a31f991b39 Doc 2021-08-17 04:41:33 +02:00
Laurent Destailleur
7a3649b6e5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-08-17 03:21:13 +02:00
Laurent Destailleur
f51bcf0038 Debug notification module 2021-08-17 03:20:57 +02:00
Laurent Destailleur
06a0d922cc NEW Can use the result_mode of mysqli driver. Save memory for list count 2021-08-16 22:01:58 +02:00
Alexandre SPANGARO
f88abb9a6f Add parenthesis 2021-08-15 07:32:46 +02:00
Alexandre SPANGARO
0d467972cd Merge branch '12.0' into 12p18 2021-08-15 07:19:33 +02:00
2125bc9aa5 CLOSE #18403 Add __URL_SHIPMENT__ substitute to get the URL of a shipment 2021-08-12 17:15:57 +04:00
84b8717693 CLOSE #18401 Add __NEWREF__ subtitute to get new object reference.
Allow the use of __NEWREF__ to get for example the new reference a draft order will get after validation.
2021-08-12 17:05:00 +04:00
cd60d09d9e FIX #18399 Fix shipment validation email template override.
Object type name for shipment was apparently wrong.
2021-08-12 16:16:45 +04:00
Vincent Dieltiens
e691217d00 Add a Global variable 'PDF_HIDE_PRODUCT_LABEL_IN_SUPPLIER_LINES' to have the possibility to hide product label in supplier order lines. 2021-08-12 13:56:41 +02:00
Laurent Destailleur
d7317025e9 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/pdf_other.php
2021-08-11 22:09:05 +02:00
Laurent Destailleur
ef4468153d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
2021-08-11 22:07:13 +02:00
Laurent Destailleur
0cf2164260 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
2021-08-11 21:15:30 +02:00
Laurent Destailleur
dd70d68b4c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-08-11 21:06:42 +02:00
Laurent Destailleur
eba55d0cf2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
2021-08-11 21:06:33 +02:00
Laurent Destailleur
bfedd4a04c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-11 20:47:51 +02:00
Laurent Destailleur
23713d1deb
Merge pull request #18328 from lainwir3d/shipment_close_order_on_close
NEW #18326 Workflow: Close order on shipment closing.
2021-08-11 20:47:06 +02:00
Laurent Destailleur
34b53592b8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2021-08-11 19:44:33 +02:00
Laurent Destailleur
310b5c974b Fix help 2021-08-11 19:43:12 +02:00
Anthony Berton
d421d3d8e3
Merge branch 'develop' into PDF_Ref_In_Title 2021-08-11 18:39:32 +02:00
Anthony Berton
32e5b531ba
Merge branch 'develop' into PDF_show_sender_name 2021-08-11 18:38:30 +02:00
Anthony Berton
956bd00c13 CHANGE_CONST_ADD_DOC 2021-08-11 18:37:13 +02:00
Anthony Berton
fb42e3f473 add_doc 2021-08-11 18:25:48 +02:00
Anthony Berton
652cd3afa5
Merge branch 'develop' into PDF_Option_show_code_client 2021-08-11 18:17:58 +02:00
Anthony Berton
a8562704cf add_doc 2021-08-11 18:16:53 +02:00
Anthony Berton
0bab31e973
Merge branch 'develop' into PDF_Propal_frame_option 2021-08-11 18:12:02 +02:00
Anthony Berton
e89c1b49a8 add_espadon_doc 2021-08-11 17:44:40 +02:00
Anthony Berton
c62c53bf5e add_sponge_doc 2021-08-11 17:42:43 +02:00
Anthony Berton
fc10fd0901 add_cyan_doc 2021-08-11 17:32:09 +02:00