Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-26 11:21:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
100,555 Commits 36 Branches 191 Tags
c03958a867d1180e5bcaf99feee94de8acdb334a
Commit Graph

135 Commits

Author SHA1 Message Date
Alexandre SPANGARO
ce7c5a0c7b Work on split module fournisseur 2021-04-11 04:24:21 +02:00
Frédéric FRANCE
fa7cd70052 code syntax product directory 2021-02-26 14:25:17 +01:00
Laurent Destailleur
dd69aed27b Fix error test 2021-01-23 17:49:08 +01:00
Laurent Destailleur
6da3ed1a51 Merge 2 exclusive options into 1 2021-01-07 12:39:51 +01:00
Florian HENRY
dfaf77b03f merge develop 2021-01-03 15:14:34 +01:00
Laurent Destailleur
2ae1aac5a4 Fix setup 2020-12-15 11:18:29 +01:00
Laurent Destailleur
31693eed21 Fix setup was not clear 2020-12-15 11:10:35 +01:00
Florian HENRY
46326d7659 merge from develop 2020-11-19 13:53:34 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Florian HENRY
d77a0b40a8 tested and approuve feaure #15036 2020-10-28 16:37:41 +01:00
Frédéric FRANCE
9a470fa42d replace deprecated 2020-10-22 22:50:03 +02:00
Laurent Destailleur
f442dac2c9 Add token on most GET url for admin action 2020-09-30 15:13:28 +02:00
Laurent Destailleur
0e4d3c19dd Fix escaping 2020-09-20 02:57:15 +02:00
Laurent Destailleur
bfbb217607 Fix GETPOST on 'action' 2020-09-16 19:39:50 +02:00
Laurent Destailleur
5ea47f3ade Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/resultat/index.php
	htdocs/product/admin/product.php
	htdocs/projet/tasks/list.php
 2020-07-08 18:11:58 +02:00
Laurent Destailleur
7d7ef1e72a FIX option PRODUIT_CUSTOMER_PRICES_BY_QTY 
Fix setup of product
 2020-07-06 15:34:26 +02:00
Anthony Berton
bda4753e41 Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE 2020-06-11 18:44:38 +02:00
Laurent Destailleur
a59961dae6 Fix td alignment 2020-06-05 23:06:59 +02:00
Frédéric FRANCE
b41ac00b98 add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
a25ed0e041 add new rule 2020-05-21 01:56:06 +02:00
stickler-ci
56a5e8ca3c Fixing style errors. 2020-05-03 17:50:10 +00:00
Anthony Berton
485ef522d2 Add option HT TTC créate product 2020-05-03 19:47:10 +02:00
Alexandre SPANGARO
5528e9ef38 Work on split module fournisseur 2020-03-24 22:02:58 +01:00
Scrutinizer Auto-Fixer
e44865d8b5 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-21 16:53:37 +00:00
atm-greg
f8ffdea5ae Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_Supplier_Packaging 2020-02-06 09:59:42 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
stickler-ci
5d051cc901 Fixing style errors. 2019-11-25 07:08:22 +00:00
atm-greg
ce15af0980 manage packaging on supplier prices 2019-11-23 15:52:34 +01:00
Frédéric FRANCE
35751a80ab 100% centpercent 2019-11-05 21:24:41 +01:00
Frédéric FRANCE
7581275316 wip 2019-10-20 11:59:21 +02:00
Frédéric FRANCE
e75f7d448c Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
fa53641221 Merge pull request #11551 from atm-quentin/NEW_global_search_product 
NEW Add hidden option to set fields for the quick search on products
 2019-08-15 20:26:05 +02:00
Laurent Destailleur
8647a20c18 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/langs/en_US/admin.lang
	htdocs/product/dynamic_price/class/price_parser.class.php
	htdocs/product/stats/facture.php
 2019-08-10 01:57:43 +02:00
Regis Houssin
0b831ccdf7 FIX better help message with multicompany 2019-08-09 09:33:14 +02:00
atm-quentin
bd2f5ba037 FIX Replace conf by hidden conf editable by user 2019-07-26 14:16:54 +02:00
Laurent Destailleur
0c6499f193 Update product.php 2019-07-25 18:01:47 +02:00
Laurent Destailleur
9a0e0fbdd2 Update product.php 2019-07-25 18:01:16 +02:00
atm-quentin
03ed4eb141 modif rowspan 2019-07-24 09:42:39 +02:00
atm-quentin
5a385bf1cc ADD extrafields on global search 2019-07-24 09:41:02 +02:00
Laurent Destailleur
2fee41f712 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-04 12:27:00 +02:00
Laurent Destailleur
8e3620fce1 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/facture/invoicetemplate_list.php
 2019-07-04 12:26:17 +02:00
atm-quentin
8cdb251ca5 FIX product_use_units was set to 0 each time a conf in block other was set 2019-07-02 10:18:03 +02:00
Laurent Destailleur
a7bd734ece Rename ->produit into ->product. Still permissions to rename. 2019-06-24 21:18:49 +02:00
Laurent Destailleur
e463b17c15 Fix look and feel v10 2019-05-21 15:31:56 +02:00
Philippe GRAND
6bdac445c5 update with html5 compliant code 2019-03-15 09:50:53 +01:00
Laurent Destailleur
e18bd6f986 Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
Frédéric FRANCE
b10558bacd Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
f30a3d59ba Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
Frédéric FRANCE
496fa9b0fb PSR2.Files.EndFileNewline.TooMany 2019-01-27 14:10:35 +01:00