lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
52,608 Commits 43 Branches 150 Tags 886 MiB
56aafa4660
Commit Graph

228 Commits

Author SHA1 Message Date
Juanjo Menent
56aafa4660 Fix #5646 Error editing Sell Price on products/services 2016-12-10 23:25:13 +01:00
Laurent Destailleur
9c8145eb88 Better fix for 416a0892d7 2016-09-02 19:19:13 +02:00
Ferran Marcet
416a0892d7 Fix: An empty variable is used to update multiprice 2016-09-02 12:32:14 +02:00
Marcos García de La Fuente
d43d0bfec1 Fixes a little problem with multiprice rules, now undefined ones evaluate to 0% variation 2016-03-08 12:16:32 +01:00
Laurent Destailleur
3864bd35c9 Fix NPR Vat is working correctly with multiprice too 2016-02-19 03:59:43 +01:00
Laurent Destailleur
4d0b9946f5 FIX Maxi serious problem when updating prices and vat of a product. All 
mode (one price, price per level, ...) were impacted. Localtax setup
were lost.
 2016-02-19 02:41:00 +01:00
Laurent Destailleur
52c82508e4 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/compta/charges/index.php
 2016-02-18 23:27:57 +01:00
Raphaël Doursenaud
dfe7c6f06f Fix #4649 Wrong parameters order 2016-02-18 12:21:11 +01:00
Laurent Destailleur
b7ae5bac6f Fix: The text "All" is not appropriate. 2016-02-14 20:48:25 +01:00
Laurent Destailleur
dfd4d36bdf Merge remote-tracking branch 'origin/3.7' into 3.8 2016-01-30 15:58:11 +01:00
Laurent Destailleur
c9661ee20e Merge remote-tracking branch 'origin/3.6' into 3.7 2016-01-30 15:57:09 +01:00
Laurent Destailleur
6e69e99227 FIX VAT Rate was not visible in log of old price list 2016-01-30 15:34:06 +01:00
Marcos García de La Fuente
83263e242e Corrected typo of PR #4444 2016-01-23 20:32:22 +01:00
Laurent Destailleur
dbaa43f3be Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/holiday/card.php
	htdocs/holiday/list.php
	htdocs/user/card.php
 2016-01-23 11:45:39 +01:00
Laurent Destailleur
dc438792f4 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/fourn/commande/card.php
 2016-01-23 11:39:37 +01:00
Laurent Destailleur
9be246baa5 Merge remote-tracking branch 'origin/3.6' into 3.7 2016-01-23 11:32:06 +01:00
Marcos García de La Fuente
da637db162 FIX #4440 Wrong price is filled by Product::fetch into multiprices arrays 2016-01-18 10:17:59 +01:00
Laurent Destailleur
f243b5230f Fix search filter disappear and clean filter button not visible. 2015-12-20 20:24:12 +01:00
philippe grand
0fe64c6091 [Qual] Uniformize code 2015-12-14 20:54:55 +01:00
Ion Agorria
57102aefde Price expression selector fix 2015-12-12 01:38:24 +01:00
Marcos García de La Fuente
3c42df935d Corrected HTML closing tag 2015-11-12 10:26:05 +01:00
Marcos García de La Fuente
80ef746348 Reverted unwanted changes 2015-11-08 19:23:02 +01:00
Marcos García de La Fuente
9cdf45e0a6 Fixed JS compatibility with multiprices price generator 2015-11-08 16:54:54 +01:00
Marcos García de La Fuente
9bc4b9f0bc Moved update function after updatePrice 2015-11-08 16:45:42 +01:00
Marcos García de La Fuente
7f0d81d255 Missing changes of PR #3927 2015-11-08 15:12:31 +01:00
Juanjo Menent
9e11289f5b Merge pull request #3927 from marcosgdf/fr-3767 
NEW #3767 Allow changing multiple prices of a product at once
 2015-11-08 11:13:04 +01:00
Laurent Destailleur
c0872d690e Use new banner for other tabs of product 2015-11-07 13:32:14 +01:00
Marcos García de La Fuente
45b4122a95 NEW #3767 Allow changing multiple prices of a product at once 2015-11-07 12:29:51 +01:00
Marcos García de La Fuente
e64057c276 Removed unnecesary attribute 2015-11-05 13:07:44 +01:00
Marcos García de La Fuente
6e8a6eca7a Fixed feature malfunction caused by commit a161e6d47a and previous changes 2015-11-05 13:06:14 +01:00
Laurent Destailleur
a161e6d47a Continue debug of PRODUIT_MULTIPRICES option. 
Introduce option PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL to have
relative caculation of multiprice not yet visible.
 2015-11-02 10:09:09 +01:00
Marcos García de La Fuente
eff1f73950 Merge branch 'develop' into multiprice-generator 
# Conflicts:
#	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
#	htdocs/product/price.php
 2015-10-27 10:41:50 +01:00
Laurent Destailleur
080ba15e0d FIX The price per level just never correctly manage the vat. Vat is not 
per level but depends on seller and supplyer. I kept a hidden option to
keep old behaviour that was bugged.
 2015-10-25 22:50:05 +01:00
Marcos García de La Fuente
c6baeacd3d Removed JS debugging 2015-10-20 11:42:56 +02:00
Marcos García de La Fuente
e7e152c122 NEW Level multiprice generator based on per cent variations over base price 2015-10-19 15:13:19 +02:00
Marcos García de La Fuente
12de2d5947 NEW [ task #3768 ] Improve product multiprices view 
Close #3768
 2015-10-18 19:34:27 +02:00
philippe grand
1762b3aaa7 [Qual] Uniformize code 2015-10-17 17:09:34 +02:00
Laurent Destailleur
b3491ef4e5 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/admin/facture_cust_extrafields.php
	htdocs/compta/facture/admin/facturedet_cust_extrafields.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
 2015-10-16 10:12:36 +02:00
Laurent Destailleur
c460873c85 FIX The filter on thirdparty prices should be visible if there is at 
least one thirdparty price.
 2015-10-06 17:13:35 +02:00
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
aspangaro
73d8f20c6b Fix: Correct directory where the donation is generated & add the action to remove_file who are generated 2015-08-25 08:09:14 +02:00
aspangaro
478947d630 Correct 2015-08-23 07:46:37 +02:00
aspangaro
7d2eae2359 Fix: Better presentation for add form 2015-08-23 07:37:38 +02:00
Francis Appels
b113e6c6bf Fix #3120 Product Customer price not updated 
Re inserted product fetch was removed in commit
e43d4a6239
 2015-07-13 11:27:35 +02:00
Laurent Destailleur
11c94a9d3b Clean code 2015-07-12 16:50:27 +02:00
Laurent Destailleur
b3c1ebf30a Debug price per customer 2015-06-19 12:13:05 +02:00
Laurent Destailleur
87e07a3038 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
	htdocs/compta/bank/virement.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/product/card.php
	htdocs/societe/soc.php
 2015-06-14 17:18:45 +02:00
Laurent Destailleur
a7cec18081 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/categories/fiche.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/install/upgrade2.php
	htdocs/product/liste.php
 2015-06-14 17:11:36 +02:00
Laurent Destailleur
f4da53c300 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/product/liste.php
	htdocs/product/price.php
 2015-06-14 17:04:24 +02:00
Marcos García de La Fuente
f9574fa458 FIX Close #2835 Customer prices of a product shows incorrect history order 2015-06-12 19:05:08 +02:00