Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
87,753 Commits 36 Branches 189 Tags
45f834cb15122c034e1666a03e920f159183d7dd
Commit Graph

1667 Commits

Author SHA1 Message Date
Laurent Destailleur
5504e3b236 Fix phpcs 2020-10-30 05:58:40 +01:00
Laurent Destailleur
ec0c8e0c79 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/core/tpl/advtarget.tpl.php
 2020-10-30 03:35:40 +01:00
Laurent Destailleur
263b679af4 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/tpl/advtarget.tpl.php
 2020-10-30 03:31:04 +01:00
quentin
fd1f5bbe01 FIX table making extrafield too small advtagertmailing 2020-10-26 15:03:32 +01:00
quentin
5694a19c6a FIX table making extrafield input too small advtargetmailing 2020-10-26 14:51:13 +01:00
Laurent Destailleur
a17c391efe Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/product/composition/card.php
 2020-10-22 17:38:48 +02:00
Laurent Destailleur
cfcac7e053 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/lib/functions2.lib.php
 2020-10-22 17:34:48 +02:00
Laurent Destailleur
9775728b7d Merge pull request #15091 from ATM-Consulting/fix/12.0_object_thirdparty_not_always_fetched_on_presend_action_from_order 
FIX 12.0 - third party of object is not always fetched when initiating an e-mail presend form
 2020-10-22 15:43:31 +02:00
Laurent Destailleur
d521ad6db4 Update objectline_edit.tpl.php 2020-10-22 15:11:54 +02:00
Laurent Destailleur
46a31f443d Update objectline_create.tpl.php 2020-10-22 15:11:01 +02:00
Florian Mortgat
56db7d6c64 FIX: also check if there is a method $object->fetch_thirdparty() before calling it 2020-10-22 15:09:48 +02:00
Florian Mortgat
509819c119 FIX 12.0 - third party of object is not always fetched when initiating the e-mail presend action (e.g. from an order) 2020-10-21 23:19:29 +02:00
Florian HENRY
0a9293c9c6 fix token CSRF check for getSupplierPrice ajax call 2020-10-21 20:40:53 +02:00
Laurent Destailleur
f2fafe04b6 Update doc 2020-10-17 18:16:03 +02:00
Laurent Destailleur
fb3d18f962 Merge pull request #14658 from OPEN-DSI/v10-fix-extrafields-sellist-linked-options-load 
FIX load default linked options for linked sellist extra fields
 2020-10-17 18:13:13 +02:00
Laurent Destailleur
a68ba1704b Fix phpcs 2020-10-05 02:25:57 +02:00
Laurent Destailleur
63415e9728 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/boxes/box_commandes.php
	htdocs/core/boxes/box_propales.php
	htdocs/core/boxes/box_shipments.php
	htdocs/core/boxes/box_supplier_orders.php
	htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
	htdocs/core/tpl/objectline_edit.tpl.php
 2020-10-04 23:27:52 +02:00
Laurent Destailleur
ca16606b4f Fix phpcs 2020-10-04 23:21:24 +02:00
Laurent Destailleur
5ed7b43214 phpcs 2020-10-03 14:48:19 +02:00
Laurent Destailleur
88714cfb18 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-10-02 14:44:23 +02:00
Laurent Destailleur
cee28d0253 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-10-02 14:43:54 +02:00
lvessiller
1b5a0ce3bf FIX uses price2numjs 2020-09-28 17:04:20 +02:00
Laurent Destailleur
c3ba8f7843 Better translation 2020-09-14 02:13:27 +02:00
lvessiller
86ce4315be FIX load default linked options for linked sellist extra fields 2020-09-07 15:19:58 +02:00
lvessiller
39a422ef94 FIX update margins rates on object line edit 2020-08-14 11:48:53 +02:00
Laurent Destailleur
39a5583930 FIX #14146 2020-08-04 13:32:26 +02:00
Laurent Destailleur
0bf678e09e Fix label of extrafields 2020-07-30 14:57:33 +02:00
Laurent Destailleur
618c85ceb1 FIX Filter too large for extrafields with type text or html 2020-07-30 14:49:31 +02:00
Laurent Destailleur
6d8060bc50 FIX DO not erase variable $key and $label during output of extrafields 
Conflicts:
	htdocs/core/tpl/extrafields_view.tpl.php
 2020-07-27 14:22:55 +02:00
Laurent Destailleur
e3126ec999 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/tpl/card_presend.tpl.php
	htdocs/multicurrency/class/multicurrency.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-07-25 00:22:47 +02:00
Laurent Destailleur
1bd00ac775 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-07-25 00:17:36 +02:00
Laurent Destailleur
960416f9bf Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/comm/card.php
 2020-07-25 00:17:28 +02:00
Laurent Destailleur
943e7c988f Update extrafields_list_print_fields.tpl.php 2020-07-24 12:55:12 +02:00
stickler-ci
8273dbcd49 Fixing style errors. 2020-07-24 08:39:09 +00:00
Frans Bosman
94498b191b Update card_presend.tpl.php 2020-07-24 10:37:19 +02:00
quentin
7bc683b234 FIX warning 2020-07-22 15:13:50 +02:00
Frans Bosman
e2592d9049 Update card_presend.tpl.php 
Add hidden options for specific sender email-adress for Invoices, Shipments and Order-confirmations
 2020-07-22 11:44:26 +02:00
Laurent Destailleur
7d7ef1e72a FIX option PRODUIT_CUSTOMER_PRICES_BY_QTY 
Fix setup of product
 2020-07-06 15:34:26 +02:00
Laurent Destailleur
1c19c97cf2 FIX missing setup of extrafields for MO 
FIX all extrafields cleared after update of one of them
FIX Update of extrafields date
FIX Update of extrafiels on draft object
FIX Sql type
Fix trans on BOM
 2020-07-04 16:14:53 +02:00
Laurent Destailleur
2865d6bd15 Fix set of free product 2020-06-24 13:39:00 +02:00
florian HENRY
7fef9a813e fix warning and clean old code about multiselect category 2020-06-18 20:03:03 +02:00
Laurent Destailleur
3831b56423 Missing tags 2020-06-11 17:07:41 +02:00
Laurent Destailleur
5b882e333d Fix tooltip on localtaxes 2020-06-10 23:00:17 +02:00
Laurent Destailleur
5794b1abea Fix for use with text browser 
Conflicts:
	htdocs/main.inc.php
 2020-06-10 12:46:55 +02:00
Laurent Destailleur
d252248319 Fix back to link in ECM menu 
Fix picto in search_page
 2020-06-05 13:41:33 +02:00
bahfir abbes
cb551cfd5a fix:non editable fields must not be editable in creation either 2020-06-01 20:58:20 +02:00
Laurent Destailleur
45615081ec FIX Bad use/detetion of text/html when forging template email. 2020-05-28 11:41:48 +02:00
Laurent Destailleur
3ef1ca1764 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/lib/files.lib.php
	htdocs/ecm/class/ecmfiles.class.php
	htdocs/ecm/index.php
 2020-05-27 14:24:03 +02:00
Laurent Destailleur
a207365bd2 FIX XSS using the renaming of .noexe files - reported by Nolan. 2020-05-27 13:12:18 +02:00
Laurent Destailleur
cce72ad8d6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/tpl/objectline_title.tpl.php
	htdocs/langs/en_US/bills.lang
	htdocs/projet/class/project.class.php
 2020-05-20 20:10:48 +02:00