Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

1161 Commits

Author SHA1 Message Date
Laurent Destailleur
9334cf8fd1 FIX #4243 sql injection 2015-12-19 18:03:08 +01:00
fappels
7fc8007571 New add shipping and dispatching from/to multiple warehouses 
Add select2 to warehouse selectors
Ship customer orderline from multiple warehouses
Dispatch client orderline to multiple warehouses
 2015-12-18 18:00:31 +01:00
Laurent Destailleur
e37fc87cd5 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-12-13 17:34:06 +01:00
Laurent Destailleur
1978eebb69 Fix bad merge 2015-12-13 17:33:20 +01:00
Laurent Destailleur
ef13bd43b0 Fix bad merge 2015-12-13 17:27:55 +01:00
Laurent Destailleur
3b595f0247 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/report.lib.php
	htdocs/langs/en_US/accountancy.lang
 2015-12-13 16:23:33 +01:00
Laurent Destailleur
a462cd232d Merge remote-tracking branch 'origin/3.7' into 3.8 2015-12-13 16:09:09 +01:00
Laurent Destailleur
4a88c9ea9f Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/product/class/product.class.php
 2015-12-13 15:53:57 +01:00
fmarcet
eb98bd1e78 FIX: Not delete a product when have customer price 2015-12-03 14:02:26 +01:00
ricardomm
eb504ffacc minor fix accessing $db 2015-12-02 11:53:23 +01:00
Laurent Destailleur
de730c9762 NEW Introduce cost price on product. 2015-11-30 21:20:45 +01:00
Laurent Destailleur
60724df496 Merge pull request #4038 from atm-maxime/develop 
NEW add info page on product card
 2015-11-21 01:51:32 +01:00
Laurent Destailleur
bf2af33b89 Merge pull request #4015 from ParisLiakos/develop 
Add a trigger for product translation deletion
 2015-11-21 00:19:40 +01:00
Maxime Kohlhaas
826592c480 Fix info and banner on societe 2015-11-19 14:43:00 +01:00
Maxime Kohlhaas
e4125c9802 NEW : info function for product card 2015-11-19 14:26:32 +01:00
Laurent Destailleur
6dc6bab556 Support of 'small', 'mini' and '' image size everywhere. 2015-11-17 10:38:00 +01:00
Paris Liakos
fb6819764d Add PRODUCT_DEL_MULTILANGS trigger for translation deletion on product 2015-11-17 01:20:58 +02:00
Laurent Destailleur
a8bfa1a258 Merge pull request #4011 from ParisLiakos/develop 
Add triggers for product and category translation changes
 2015-11-16 23:50:18 +01:00
Paris Liakos
146aa7815b Add X_SET_MULTILANGS triggers to make possible reacting on translation changes for products and categories 2015-11-16 20:27:51 +02:00
Laurent Destailleur
6bd6be0912 Debug and rename experimental module "supplier proposal". Still work to 
do: Must fix the PDF to be compliant with a request quotation to a
supplier (so no need to show vat, unit price, ...).
 2015-11-15 19:23:39 +01:00
Marcos García de La Fuente
04243510f3 Little changes 2015-11-08 14:54:29 +01:00
Juanjo Menent
59b3124d7d Merge pull request #3938 from marcosgdf/fr-3876 
NEW #3876 Renamed Product::isservice and Product::isproduct to match PSR-2
 2015-11-08 11:20:36 +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
24dff1d842 NEW Statistic graphs on products offer a filter on product type (product 
/ service or both)
 2015-11-08 00:35:30 +01:00
Laurent Destailleur
57e162d7f8 The component selectAjaxArray can return javascript part into a global 
"delayed" variable so caller can output it at end of page. This reduce
the Flash Over Unstyle Content effect.
 2015-11-07 15:46:06 +01:00
Marcos García de La Fuente
75b4cb4727 NEW #3876 Renamed Product::isservice and Product::isproduct to match PSR-2 2015-11-07 14:37:47 +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
Laurent Destailleur
b2d9f21253 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-06 18:57:46 +01:00
Laurent Destailleur
d0e6db7f89 Use the new banner for first tab of products. 2015-11-06 18:57:35 +01:00
Laurent Destailleur
9cb2d046d0 Merge pull request #3919 from marcosgdf/bug-3914 
FIX #3194 Properties Product::multiprices_min and Product::multiprices_min_ttc, Product::url dynamically declared
 2015-11-06 12:32:26 +01:00
Marcos García de La Fuente
9969179267 NEW Deprecated Product::setPriceExpression. Use Product::update instead 2015-11-06 11:35:39 +01:00
Marcos García de La Fuente
610ef2359d FIX #3914 Properties Product::multiprices_min and Product::multiprices_min_ttc, Product::url dynamically declared 
Close #3914
 2015-11-06 11:26:06 +01:00
Marcos García de La Fuente
f62d6d1950 FIX Product::updatePrice() now sets new prices to Product::multiprices_* arrays 2015-11-06 11:08:41 +01:00
Laurent Destailleur
da0aa2f937 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
	htdocs/langs/en_US/main.lang
	htdocs/product/list.php
	htdocs/product/stock/mouvement.php
 2015-11-02 19:31:42 +01:00
Laurent Destailleur
f928062e2b FIX #3726 Better support for PRODUCT_USE_OLD_PATH_FOR_PHOTO 2015-11-02 17:56:32 +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
e1f2efee4d Merge branch 'develop' into multiprice-generator 
# Conflicts:
#	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2015-10-31 11:46:14 +01:00
fmarcet
310ecb1e09 FIX: Show product image on getNomUrl() 2015-10-29 12:28:28 +01:00
Laurent Destailleur
4042c6d5cc Minor fixes 2015-10-28 23:02:02 +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
Marcos García de La Fuente
6db09a0d64 Little correction 2015-10-20 11:35:49 +02:00
Frédéric FRANCE
50fe3f6ee9 Update html.formproduct.class.php 2015-10-19 22:06:46 +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
Laurent Destailleur
ccce974476 Fix #3766 2015-10-18 21:00:19 +02:00
Laurent Destailleur
2ad805912d Fix #3765 2015-10-18 20:58:39 +02:00
Laurent Destailleur
fc1718c0d2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-18 20:57:39 +02:00
Laurent Destailleur
a0e30aa218 Fix #3764 2015-10-18 20:57:28 +02:00
Laurent Destailleur
4dc88406ac Merge pull request #3737 from frederic34/patch-15 
Bad chmod for directory when changing product ref
 2015-10-18 20:28:17 +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
Raphaël Doursenaud
6c2b46f939 Fix #3728 Properly remove last category 2015-10-15 10:15:37 +02:00