lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
89,326 Commits 43 Branches 150 Tags 886 MiB
59bc8ee07c
Commit Graph

5575 Commits

Author SHA1 Message Date
Laurent Destailleur
59bc8ee07c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/stats/byproperties.php
	htdocs/adherents/stats/geo.php
	htdocs/admin/system/dolibarr.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/tpl/objectline_title.tpl.php
	htdocs/langs/en_US/admin.lang
	htdocs/product/class/product.class.php
 2020-09-14 02:49:19 +02:00
Laurent Destailleur
d0698735d6
Update product.class.php 2020-09-14 00:14:25 +02:00
DEMAREST Maxime (Indelog)
1c523abbd8 Fix: getLabelOfUnit() for Product, CommonObjectline to print long label 
Also add $type = 'code' for return unit code in form 'unitXX' (where XX
is the code of unit).

for get return like unitXX where XX is the code of unit
 2020-09-13 07:44:30 +02:00
Laurent Destailleur
1f8278c8ca Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/core/class/html.formmail.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/langs/en_US/other.lang
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-09-12 04:42:59 +02:00
Laurent Destailleur
009c7eaf31 Standardize code with module builder 2020-09-11 16:16:04 +02:00
DEMAREST Maxime (Indelog)
e41afeacf4 Fix: short label of unit in Product::getLabelOfUnit 2020-09-11 15:34:11 +02:00
Laurent Destailleur
64b28020c8 Look and feel v13 2020-09-11 13:14:14 +02:00
Laurent Destailleur
0d124730a8 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/list.php
 2020-09-10 18:05:18 +02:00
Laurent Destailleur
f06737097f Look and feel v13 2020-09-10 16:37:42 +02:00
Laurent Destailleur
b8fe2188a6 Standardize code around model_pdf 2020-09-10 01:49:09 +02:00
Laurent Destailleur
c761b829b4
Merge pull request #14659 from Tim-Otte/feature-filterable-purchase-price-table-columns 
NEW Purchase price table: Added filterable table columns
 2020-09-09 18:55:55 +02:00
Scrutinizer Auto-Fixer
c263c8a76c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-08 19:27:28 +00:00
Florian Mortgat
4a60725f6c FIX: round stock value on product list 2020-09-08 16:42:41 +02:00
stickler-ci
a9a95c8a83 Fixing style errors. 2020-09-07 13:47:26 +00:00
Tim Otte
c6cb179447 Added filterable table columns 2020-09-07 15:43:36 +02:00
Scrutinizer Auto-Fixer
b78ff67d7e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-07 08:18:17 +00:00
Laurent Destailleur
7e879a8012 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-04 22:44:49 +02:00
Laurent Destailleur
a2db403abe Fix phpcs 2020-09-04 22:44:31 +02:00
Laurent Destailleur
c8da9f97a8 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2020-09-04 19:51:22 +02:00
Laurent Destailleur
2e7f588cac FIX using decimal on stock correction 
Conflicts:
	htdocs/product/stock/product.php
 2020-09-04 19:38:56 +02:00
Laurent Destailleur
0c1a5d9e25 FIX using decimal on stock correction 2020-09-04 19:34:20 +02:00
Laurent Destailleur
4fdbfa8224 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-04 16:30:55 +02:00
Laurent Destailleur
e21b3f6681 FIX bad route url to delete subproduct with API 2020-09-04 13:23:11 +02:00
Laurent Destailleur
ef0c9df5ff
Merge pull request #14224 from cfoellmann/disable-eatby-sellby 
NEW Can hide eatby, sellby dates with option PRODUCT_DISABLE_SELLBY and PRODUCT_DISABLE_EATBY
 2020-09-04 12:09:30 +02:00
Laurent Destailleur
564a47e41c
Update productlot_list.php 2020-09-04 12:08:10 +02:00
Laurent Destailleur
f88d2bdbbf
Merge pull request #14618 from TobiasSekan/ShowNumAndClickWarehouseArea 
NEW Show header number and make it clickable in warehouse area
 2020-09-03 12:23:45 +02:00
Sekan, Tobias
38da331a8b Show number and clickable on warehouse area 2020-09-03 10:41:42 +02:00
Laurent Destailleur
d69f08e489 WIP 2020-09-01 01:24:05 +02:00
Laurent Destailleur
887d4e0603 Add unique key on table of inventory details 2020-08-31 20:02:06 +02:00
Laurent Destailleur
ad87e753b4 Clean trim on GETPOST (already included inside GETPOST when not 'none' 2020-08-28 21:27:50 +02:00
Laurent Destailleur
4ecd15b7ab Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/langs/en_US/main.lang
 2020-08-27 21:57:42 +02:00
Laurent Destailleur
c419e2f0de Sanitize vars 2020-08-27 21:18:49 +02:00
Christian Foellmann
b1849aed5c fix for mistakenly uncommented code 2020-08-24 07:53:25 +02:00
Alexandre SPANGARO
142ce7c03f Fix Missing language key 2020-08-21 04:58:21 +02:00
stickler-ci
3c108e8bbf Fixing style errors. 2020-08-20 13:31:48 +00:00
Christian Foellmann
179fc2e70a hide other eatby sellby dates 2020-08-20 15:27:34 +02:00
Christian Foellmann
b777c62557 hide eatby sellby on product/stock/product 2020-08-20 12:13:05 +02:00
Christian Foellmann
df3fcec6c6 hide dates on erassortlot.php 2020-08-19 16:44:45 +02:00
Christian Foellmann
2873e6bdca hide dates in productlot_list 2020-08-19 16:33:41 +02:00
stickler-ci
8191447007 Fixing style errors. 2020-08-19 16:33:41 +02:00
Christian Foellmann
b6af4014de hide eatby, sellby dates 2020-08-19 16:33:41 +02:00
Laurent Destailleur
90545ac443 css 2020-08-19 01:59:03 +02:00
Laurent Destailleur
3e91d77920 FIX Update extrafields on warehouse 2020-08-18 18:35:40 +02:00
Laurent Destailleur
964c4ef0d2 Standardize code. Use model_pdf. 2020-08-18 14:48:38 +02:00
Laurent Destailleur
58e25768a7 NEW Add PDF document templates for warehouses (list of stock) 2020-08-18 14:02:36 +02:00
Laurent Destailleur
bd65e5612f Fix duplicate id 2020-08-17 20:06:01 +02:00
Laurent Destailleur
68b6fdb508 Fix missing tags 2020-08-17 19:48:05 +02:00
Laurent Destailleur
0245eb102c Fix css on fields that are not mandatory 2020-08-17 19:44:06 +02:00
Laurent Destailleur
bdcb945dda Work on inventory 2020-08-17 16:04:12 +02:00
Laurent Destailleur
b7c38f4617
Merge pull request #14433 from c3do/patch-1 
NEW Triggers Attributes and Attributes values
 2020-08-16 23:45:32 +02:00