lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
65,975 Commits 43 Branches 150 Tags 886 MiB
7.0
Commit Graph

144 Commits

Author SHA1 Message Date
Laurent Destailleur
9f2437fa04 Fix missing field 2018-06-20 17:59:01 +02:00
Laurent Destailleur
e79f6fda2b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-01-26 01:23:18 +01:00
Laurent Destailleur
2c0eeaf8de FIX #8093 2018-01-25 20:57:51 +01:00
Ion
e95ee4b878 Fix old parseProductSupplier call 2017-11-10 12:32:54 +01:00
Laurent Destailleur
5482f80c0e Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-26 10:30:47 +02:00
Laurent Destailleur
59571b1ce1 FIX #7473 Mass update of vat rates and other bugs on localtax 2017-09-26 10:29:44 +02:00
Laurent Destailleur
681623c3ab Merge branch 'develop' into patch-1 2017-08-22 11:43:25 +02:00
Laurent Destailleur
206d46cbb7 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	scripts/cron/cron_run_jobs.php
 2017-08-22 11:18:17 +02:00
Laurent Destailleur
41ce4886fd Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-08-22 11:15:30 +02:00
fappels
ca3cdfabec FIX Best buy price calculation 
Best buy price also depends on buy discount.
 2017-08-09 14:15:26 +02:00
Laurent Destailleur
9f486716c1 Fix phpcs 2017-07-08 14:56:43 +02:00
fappels
574590a598 Add minimum qty column 2017-06-30 10:55:45 +02:00
fappels
d0599cd952 Revert "WAP alway decimal 2 digits" 
This reverts commit 7d4a093d9e.
 2017-06-30 10:54:04 +02:00
fappels
7d4a093d9e WAP alway decimal 2 digits 2017-06-30 10:52:54 +02:00
fappels
e3f7402e07 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_nbr_suppliers_prod_list 2017-06-26 22:45:18 +02:00
fappels
13e5c8ff7a Create patch 
Add Number of supplier prices and wap columns
 2017-06-26 22:44:56 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
Laurent Destailleur
e2a7b0943f Clean dead code 2017-05-17 14:52:27 +02:00
BENKE Charlie
3299e5f889 PRODUCT_PRICE_SUPPLIER_NO_LOG test inverted 
if PRODUCT_PRICE_SUPPLIER_NO_LOG is empty, no log is stored
if PRODUCT_PRICE_SUPPLIER_NO_LOG is not empty log is stored
they are inversion
@eldy maybe add more field in this table
 2017-03-26 19:13:10 +02:00
fappels
a84c6f9b45 Qual reputation for price supplier 
Move available reputation constants from view-controller to class
 2017-02-08 13:35:34 +01:00
gauthier
7d63925118 NEW : param socid find_min_price_product_fournisseur() function 2016-10-18 15:35:48 +02:00
Frédéric FRANCE
7004dfbc15 typo 2016-06-25 09:57:46 +02:00
Laurent Destailleur
293c8e145a Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/imports/import.php
	htdocs/langs/en_US/admin.lang
 2016-06-05 02:20:27 +02:00
Maxime Kohlhaas
3ef9fe2c40 Fix product supplier price modification with multicompany 2016-06-04 18:10:40 +02:00
Ion Agorria
6ba86e9d03 Fill ref_supplier in product supplier price 2016-05-26 20:53:01 +02:00
Laurent Destailleur
4e46a01d51 Fix regression introduced with option SUPPLIERORDER_WITH_NOPRICEDEFINED 2016-05-17 22:59:46 +02:00
Laurent Destailleur
c795803da1 FIX ref_supplier was not set. We also refered to old var names. 2016-05-05 20:19:56 +02:00
Laurent Destailleur
8d46d76f96 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/facture/paiement.php
 2016-04-12 15:05:18 +02:00
Laurent Destailleur
e61c83d708 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/fourn/facture/paiement.php
 2016-04-12 15:03:19 +02:00
Laurent Destailleur
8342a61ea9 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/fourn/facture/card.php
	htdocs/product/composition/card.php
 2016-04-12 15:00:02 +02:00
Christophe Battarel
791df0c9ea FIX: correct display of minimum buying price 2016-04-11 17:27:34 +02:00
Laurent Destailleur
f8b39ab50e Fix errors reported by scrutinizer 2016-04-09 19:04:23 +02:00
Laurent Destailleur
3827a06796 Debug the supplier ref reputation feature. 2016-04-08 22:18:36 +02:00
Alexis Algoud
61a077b0ee NEW reputation for price supplier 2016-04-06 09:58:03 +02:00
BENKE Charlie
e455a2c9a8 only enabled society is used for product select 2016-03-07 08:25:21 +01:00
Laurent Destailleur
8807222f24 Fix a lot of fixes to have the french vat npr working better 2016-02-27 12:22:39 +01:00
Laurent Destailleur
c86a1a30d5 Fix a lot of fixes to have the french vat npr working better 2016-02-27 11:46:16 +01:00
Ion Agorria
89657d0439 Changed Price Parser functions and added testExpression 2016-02-14 17:28:31 +01:00
Ion Agorria
99efbd3464 Check if dynamic price is enabled 2016-02-14 16:09:47 +01:00
Ion Agorria
1f99ce8ae9 Fix var typo 2016-02-14 01:21:56 +01:00
Ion Agorria
1a45ab9d50 Fix missing vars in fetch_product_fournisseur_price 2016-02-11 20:29:45 +01:00
Sof
c04eef35d5 FIX: Field cost_price does not exist and typos 2015-12-28 19:07:25 +01:00
Laurent Destailleur
de730c9762 NEW Introduce cost price on product. 2015-11-30 21:20:45 +01:00
Laurent Destailleur
72915aa16d Merge pull request #3784 from All-3kcis/develop-patch-11 
NEW Add trigger "SUPPLIER_PRODUCT_BUYPRICE_DELETE"
 2015-11-02 11:23:49 +01:00
All-3kcis
a658ff7e90 add commit or rollback if error 2015-11-02 10:26:07 +01:00
All-3kcis
00c2b1a32a move db->begin() before trigger 2015-10-22 14:30:11 +02:00
All-3kcis
ceae04b76e move trigger before query 2015-10-22 12:03:01 +02:00
All-3kcis
ca8c1adf55 Add trigger "SUPPLIER_PRODUCT_BUYPRICE_DELETE" for frounisseur.product remove_product_fournisseur_price() 2015-10-21 10:07:53 +02:00
All-3kcis
3cb2637f25 Correct return value 2015-10-20 09:42:02 +02:00
Laurent Destailleur
3d94e3d80e FIX Editing a supplier price should keep the vat. 2015-10-17 12:01:17 +02:00