Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-03-20 00:53:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
56,393 Commits 39 Branches 193 Tags
6da82762f2f654fa38e3132ec66f94de849cc75b
Commit Graph

546 Commits

Author SHA1 Message Date
Laurent Destailleur
e59c2bb61c Debug accounting menu. Can now edit product account if already set. 2016-11-04 16:15:31 +01:00
Laurent Destailleur
6df4666cf3 Uniformize code 2016-10-30 16:19:31 +01:00
BENKE Charlie
632fe49fb9 bad setting on get_entity fournisseur 2016-10-26 16:59:58 +02:00
Laurent Destailleur
79d376ee12 Debug accountancy module 2016-10-14 13:05:01 +02:00
Laurent Destailleur
ee252f549a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	dev/skeletons/skeleton_list.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/core/lib/cron.lib.php
	htdocs/core/tpl/admin_extrafields_add.tpl.php
 2016-10-01 18:42:50 +02:00
Laurent Destailleur
43da410b95 FIX #5763 Bug: Cannot Create Supplier Price Request 2016-10-01 16:36:01 +02:00
Laurent Destailleur
8fa8bc7d34 Rename table for a better understanding 2016-09-22 11:39:43 +02:00
gauthier
2556e59ccf NEW : auto delete product_stock_entrepot elements when we drop a product or a warehouse 2016-09-21 16:21:23 +02:00
Laurent Destailleur
9ff1809f85 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/card.php
	htdocs/product/stock/class/productlot.class.php
	htdocs/theme/eldy/style.css.php
 2016-09-12 02:05:38 +02:00
Laurent Destailleur
1bb278a587 Fix #5712 2016-09-11 23:01:04 +02:00
Laurent Destailleur
25c5f40bf1 Add css on picto status 2016-09-10 19:44:55 +02:00
Laurent Destailleur
b107b0644f Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-02 22:07:17 +02:00
fappels
aedd813236 Delete product_lot when product deleted 2016-09-02 18:13:25 +02:00
Laurent Destailleur
d6d474f10d Clean code for category management. 2016-08-29 21:31:27 +02:00
Laurent Destailleur
661526f822 Fix for jmobile 2016-08-28 16:00:02 +02:00
Laurent Destailleur
e46bda5f9a Fix for jmobile 2016-08-28 15:58:52 +02:00
Laurent Destailleur
4d4fc87e2b Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/product/stock/productlot_list.php
	htdocs/websites/index.php
 2016-08-09 13:26:08 +02:00
Laurent Destailleur
e168888c59 NEW Reduce nb of picto on ref into list, merging preview and download 2016-08-05 12:20:11 +02:00
Laurent Destailleur
e1e8254bcf Fix thumbs are using same extension than original. 2016-08-05 04:31:19 +02:00
Laurent Destailleur
aae2086ada Move notes on dedicated tabs like other elements. 
Rename also the note available into translation tab into "other" to
avoid confusion because it was not the same usage.
 2016-07-28 13:53:17 +02:00
BENKE Charlie
8830264c0e tooltip not present on picto, already present in $link 
and some case they are conflict
 2016-07-20 02:27:40 +02:00
BENKE Charlie
0ba308a9a5 Update product.class.php 2016-07-15 11:52:59 +02:00
BENKE Charlie
26f27487b9 Add hook for additionnal feature on element tooltip 2016-07-14 18:40:49 +02:00
Laurent Destailleur
59c6c90200 Remove a FIXME. 2016-06-08 11:40:50 +02:00
Laurent Destailleur
f552f3a7d5 Fix missing $notrigger on product delete 2016-06-07 20:51:06 +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
Laurent Destailleur
0f53993c6f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-02 11:24:24 +02:00
Laurent Destailleur
5106f40a56 Merge branch 'develop_NEW_decrease_stock_expedition_classify' of 
https://github.com/atm-alexis/dolibarr into
atm-alexis-develop_NEW_decrease_stock_expedition_classify

Conflicts:
	htdocs/expedition/class/expedition.class.php
 2016-06-02 11:23:49 +02:00
Ion Agorria
ade417855b Fill ref_supplier in product get_buyprice 2016-05-29 13:45:26 +02:00
Laurent Destailleur
b82eabe25f Code comment 2016-05-19 18:52:12 +02:00
Laurent Destailleur
4e46a01d51 Fix regression introduced with option SUPPLIERORDER_WITH_NOPRICEDEFINED 2016-05-17 22:59:46 +02:00
Laurent Destailleur
89d37ccc62 Fix translation 2016-05-17 21:55:39 +02:00
Laurent Destailleur
7bbb3a7da1 Supplier proposal was missing 2016-05-17 19:34:23 +02:00
Laurent Destailleur
e2d3f4e27d Supplier proposal was missing 2016-05-17 19:15:44 +02:00
Laurent Destailleur
d083ad9382 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/product/class/product.class.php
	htdocs/resource/class/html.formresource.class.php
 2016-05-17 18:21:22 +02:00
Laurent Destailleur
79be93d998 FIX The table llx_product_lot is now filled/used to store eatby/sellby 
dates.
 2016-05-17 18:19:36 +02:00
Laurent Destailleur
0e040b166d Fix: When we edit a product to use lot/serial number, we initialize 
records for unknown lots to generic value 'Undefined'.
 2016-05-17 17:55:41 +02:00
Alexis Algoud
8d0e5479a0 Rename var 2016-05-14 19:22:27 +02:00
Alexis Algoud
e74e70287f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_decrease_stock_expedition_classify 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/product/stock/replenish.php
 2016-05-14 19:14:39 +02:00
Laurent Destailleur
2b6029f5d3 FIX Some fix on stock. Condition to view warehouse as column and 
protection against infinite loop
 2016-05-12 19:44:49 +02:00
Laurent Destailleur
c8d98dbfdc FIX error reported by scrutinizer 2016-05-08 11:33:46 +02:00
Laurent Destailleur
b4e5acbaa9 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/product/class/product.class.php
 2016-05-04 14:43:40 +02:00
Laurent Destailleur
568a43214d Add code comment 2016-05-04 13:51:47 +02:00
Laurent Destailleur
911e862a8e Fix missing translation and add a TODO to avoid infinite loop. 2016-05-04 13:49:05 +02:00
Laurent Destailleur
7998cefdd2 Fix mark a deprecated function as deprecated 2016-05-04 13:15:00 +02:00
Laurent Destailleur
1bfc7e9b70 Merge pull request #5104 from fappels/patch-1 
Update product.class.php
 2016-04-30 00:28:22 +02:00
BENKE Charlie
49c3c69e30 minor error code 2016-04-29 20:20:47 +02:00
Laurent Destailleur
f5df6488db Merge pull request #5094 from defrance/patch-2 
minor error code
 2016-04-29 20:18:55 +02:00
Laurent Destailleur
e723966583 FIX: Qty in stock must be float like it is in stock movement. 
FIX: Can't create a stock transfer from product card
Performance enhancement of stock information loading.
 2016-04-28 11:01:56 +02:00