Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-30 05:11:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
68,401 Commits 37 Branches 191 Tags
d5aed3394dea03d152db518a6d96547b82b176c1
Commit Graph

851 Commits

Author SHA1 Message Date
Frédéric FRANCE
a0a6afc224 return comment 2018-08-14 12:23:10 +02:00
Laurent Destailleur
9fc5d39d07 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-12 20:09:36 +02:00
Laurent Destailleur
dc8c4402ee Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-12 20:09:22 +02:00
Laurent Destailleur
12e21b4886 FIX update extrafields 2018-08-12 16:29:26 +02:00
atm-greg
ad5f59822e Merge branch 'develop' of github.com:Dolibarr/dolibarr into Add_supplier_product_description 2018-08-07 09:33:30 +02:00
atm-greg
fc705e8510 Merge branch '8.0' of github.com:Dolibarr/dolibarr into Add_supplier_product_description 2018-08-07 09:31:41 +02:00
atm-greg
a8b33a1710 New fields desc_supplier on product_fourn_prices 2018-08-06 16:26:25 +02:00
Frédéric FRANCE
a0a5d33641 test include 2018-07-26 17:30:53 +02:00
Laurent Destailleur
20e360e918 Start to introduce array fields for products 2018-07-15 18:22:26 +02:00
Laurent Destailleur
d5cb2fc4cd Update productcustomerprice.class.php 2018-07-09 17:04:50 +02:00
Laurent Destailleur
551e2efe86 Update productcustomerprice.class.php 2018-07-09 17:03:55 +02:00
Regis Houssin
e8afd7e833 Fix: use "supplier" instead "reseller" 2018-07-07 08:48:26 +02:00
Regis Houssin
1522a5b22d Fix: differentiate customer prices from supplier prices sharing 2018-07-07 08:43:59 +02:00
Laurent Destailleur
7981bd08b7 Fix price+sql error when adding product when no supplier price defined 2018-06-16 14:47:33 +02:00
Laurent Destailleur
910652eb6d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/langs/en_US/admin.lang
 2018-06-13 23:07:30 +02:00
fappels
a86c90fed1 Fix Wrong error for duplicate ref if barcode enabled but not set. 2018-06-12 16:38:42 +02:00
Laurent Destailleur
29ee5dffc4 Clean code 2018-06-04 12:55:55 +02:00
Laurent Destailleur
be2c49d490 Fix log 2018-06-01 17:39:07 +02:00
Frédéric FRANCE
8547827575 Merge remote-tracking branch 'upstream/develop' into multipriceqty 2018-05-23 17:06:02 +02:00
Frédéric FRANCE
efbb053e54 PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES 2018-05-23 17:05:08 +02:00
Laurent Destailleur
546da0ceda Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/core/modules/modStock.class.php
	htdocs/product/inventory/list.php
 2018-05-05 14:40:39 +02:00
Laurent Destailleur
634e58b7c9 Look and feel v8 2018-05-04 18:24:00 +02:00
fappels
db76fd7895 Fix delete all product variants of a parent product 
User object missing
 2018-05-02 22:33:23 +02:00
Laurent Destailleur
0cdfd6800a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-29 20:11:47 +02:00
Laurent Destailleur
aafab12f4b Debug API for ticket module 2018-04-29 18:06:31 +02:00
Frédéric FRANCE
657fa48c3f Update api_products.class.php 2018-04-23 15:31:55 +02:00
Laurent Destailleur
411949a6bb Optimize constructors 2018-04-21 15:08:46 +02:00
Laurent Destailleur
394b988a4e FIX key in getEntity for supplier proposals 2018-04-21 14:41:31 +02:00
Laurent Destailleur
c30b0da07d Clean code 2018-04-21 12:12:46 +02:00
Laurent Destailleur
0d0da234b1 Lowercase NULL, TRUE, FALSE according to PSR2 2018-04-16 13:51:16 +02:00
Laurent Destailleur
eeb2580f32 Fix foreign key error 2018-04-10 22:23:21 +02:00
Laurent Destailleur
7108f68db9 Remove old deprecated hook insertExtraFields. Triggers must be used for 
action on CRUD events.
 2018-04-10 12:03:01 +02:00
Laurent Destailleur
ff411ed2e5 NEW Add accounting account number on product tooltip 2018-04-08 23:54:04 +02:00
Marc de Lima Lucio
3646374976 NEW: default warehouse field for products + prefill warehouses when dispatching supplier orders 2018-03-28 11:54:21 +02:00
Laurent Destailleur
72cedcf9f3 Removed method fetch_prods() and get_each_prod() not used, keep only 
get_arbo_each_prod() that is better.
 2018-03-22 18:01:06 +01:00
Laurent Destailleur
9980a5fbd0 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2018-03-22 14:08:43 +01:00
Laurent Destailleur
700c69e127 NEW Can set position of images in module tickets 
Mutualize code of method show_photo
 2018-03-22 11:46:35 +01:00
fappels
9e4a66b1a9 Fix hidden oprion PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION 2018-03-22 10:46:54 +01:00
Laurent Destailleur
c962b89495 NEW hook getnomurltooltip is replaced with hook getNomUrl more powerfull 2018-03-15 20:46:55 +01:00
Laurent Destailleur
302fed8646 More fa image to replace png picto 2018-03-14 20:08:44 +01:00
Laurent Destailleur
64f21b8a3c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/card.php
 2018-03-11 00:10:13 +01:00
Laurent Destailleur
6c9e0e1752 Merge branch '7.0' into 7.0 2018-03-10 21:52:57 +01:00
Laurent Destailleur
905cf112e9 Merge pull request #8327 from tiaris/fix7.0 
FIX #8289
 2018-03-10 18:58:22 +01:00
Laurent Destailleur
6fcc271790 Update product.class.php 2018-03-10 18:57:55 +01:00
BadPixxel
44d18027f2 BugFix for PHP7.1: PHP Warning: A non-numeric value encountered in /tmp/Dolibarr/htdocs/product/class/product.class.php on line 1709 2018-03-10 15:48:40 +01:00
jean
6793bfae3a FIX #8289 add a cofoiguration for correct stopck calculation 2018-03-10 14:17:52 +01:00
Laurent Destailleur
cf45f78d7e Merge pull request #8218 from OPEN-DSI/product_supplier_buyprice_multicurrency 
NEW Add multicurrency support for product buy price for supplier propales, orders and invoices
 2018-03-07 13:12:23 +01:00
Laurent Destailleur
19ae24f693 Code comment 2018-02-26 21:03:52 +01:00
KHELIFA
54dba24ab5 Add multicurrency support for product buy price for supplier propales, orders and invoices 2018-02-23 11:06:07 +01:00
Laurent Destailleur
c4130730cb Clean code around fetch_optionals() 2018-02-20 19:38:18 +01:00