Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
103,106 Commits 36 Branches 189 Tags
901bab2ca2608559d8865800e8768fc24c29fde4
Commit Graph

25468 Commits

Author SHA1 Message Date
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
lainwir3d
2125bc9aa5 CLOSE #18403 Add __URL_SHIPMENT__ substitute to get the URL of a shipment 2021-08-12 17:15:57 +04:00
lainwir3d
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
lainwir3d
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
jpb
b1cba14718 merge conflict 2021-08-12 09:36:34 +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