lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
88,265 Commits 43 Branches 150 Tags 886 MiB
a2e4e2d3b2
Commit Graph

5505 Commits

Author SHA1 Message Date
Laurent Destailleur
d2eb1cc47d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/tpl/stockcorrection.tpl.php
 2020-08-06 02:20:49 +02:00
Laurent Destailleur
12b9a73ca5 Fix phpcs 2020-08-06 02:18:34 +02:00
Laurent Destailleur
9d79e984dd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/tpl/stockcorrection.tpl.php
 2020-08-06 02:15:04 +02:00
Laurent Destailleur
1f02b33195 Work on inventory 2020-08-05 12:25:26 +02:00
Laurent Destailleur
0884678264 Look and feel v12 2020-08-05 11:10:38 +02:00
Laurent Destailleur
201c3f87ca WIP Inventory module 2020-08-05 10:40:43 +02:00
Laurent Destailleur
4c1aa25b32 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/admin/adherent_emails.php
	htdocs/core/tpl/extrafields_list_search_title.tpl.php
	htdocs/product/traduction.php
 2020-08-04 13:51:11 +02:00
Laurent Destailleur
30560397e4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/class/commondocgenerator.class.php
 2020-08-04 13:43:00 +02:00
Laurent Destailleur
83a9be2428 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2020-08-04 13:41:19 +02:00
Laurent Destailleur
2076d18825 FIX Param of fetch_name_optionals_label must be object->table_element 2020-08-04 12:47:09 +02:00
Tim Otte
0e03578e91 Fixed translation of product units in documents 2020-08-04 11:51:40 +02:00
Laurent Destailleur
e455f8afa6
Merge pull request #14369 from Tim-Otte/fix-product-unit-translation 
Fixed translation of product units in documents
 2020-08-04 11:50:50 +02:00
Francis Appels
81467e1d09 FIX search warehouse list 2020-08-04 11:05:12 +02:00
Tim Otte
360afccecc Fixed translation of product units in documents 2020-08-04 11:02:16 +02:00
quentin
b026896a98 FIX product label and desc were never updated when modifying trans 2020-08-03 10:33:48 +02:00
Laurent Destailleur
7149cbb532 NEW Add public note on products. This also partially fix the #14342 2020-08-02 17:09:21 +02:00
Laurent Destailleur
be34a2c607 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/cashdesk.lang
	htdocs/product/stock/list.php
 2020-08-02 16:06:51 +02:00
Laurent Destailleur
9aa9852e85 Fix perms 2020-08-02 01:35:03 +02:00
Laurent Destailleur
ebe2e8ea04
Merge pull request #14319 from aspangaro/13a3 
NEW: Introduce constant FACTUREFOURN_REUSE_NOTES_ON_CREATE_FROM
 2020-08-02 01:33:39 +02:00
Laurent Destailleur
32d2dd71e2
Merge pull request #14324 from FHenry/dev_add_ProductHook 
NEW add formConfirm hook on product page
 2020-08-02 01:29:33 +02:00
Laurent Destailleur
817912ea40 FIX #14291 2020-08-02 01:11:23 +02:00
florian HENRY
e44a1fd33f ->error rather than dol_print_error into product 2020-07-31 16:09:38 +02:00
florian HENRY
164e3bff2c add formConfirm hook 2020-07-31 15:23:26 +02:00
Alexandre SPANGARO
d1560c3e75 NEW: Introduce constant FACTUREFOURN_REUSE_NOTES_ON_CREATE_FROM 2020-07-30 21:10:06 +02:00
Laurent Destailleur
f5d7e94d7e NEW Add a stat page to list popularity of products on invoices 
Merge duplicate pages into 1.
 2020-07-30 19:32:06 +02:00
Laurent Destailleur
e7fedd5c2d FIX Sql error on stat by referring entries of a product 2020-07-30 19:14:40 +02:00
Laurent Destailleur
3e586d3b26
Merge pull request #14285 from RomainDeschamps/patch-7 
NEW add costprice in fields of products list
 2020-07-29 13:57:17 +02:00
Laurent Destailleur
2687666579 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-07-29 13:54:12 +02:00
Laurent Destailleur
8045cff888 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
 2020-07-29 13:53:09 +02:00
Laurent Destailleur
930ae84dac Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/contact/list.php
	htdocs/core/lib/pdf.lib.php
 2020-07-29 13:50:31 +02:00
Laurent Destailleur
9bef1ef6dd
Merge pull request #14298 from bafbes/abb110230 
fetch product model_pdf field
 2020-07-29 13:19:09 +02:00
Laurent Destailleur
1d686a0d4c
Update product.class.php 2020-07-29 13:18:49 +02:00
Laurent Destailleur
af177f2833
Update reassort.php 2020-07-29 13:07:02 +02:00
Laurent Destailleur
d1cb7d447f
Merge branch 'develop' into FIX_10.0_reassort_hooks 2020-07-29 13:05:12 +02:00
VERDOL Gauthier
d214dbb5fd FIX : Order by amount in product propal stats must be done on d.total_ht and not p.total 2020-07-28 15:42:54 +02:00
Marc DLL
a4427bd2d2 FIX: product stock/reassort list: add hooks 2020-07-27 23:58:06 +02:00
abb
fd6477c054 fetch product model_pdf field 2020-07-27 10:57:39 +01:00
stickler-ci
fd34908c17 Fixing style errors. 2020-07-24 11:42:18 +00:00
Romain DESCHAMPS
c370241afd
add costprice in fields of the list 2020-07-24 13:40:06 +02:00
Laurent Destailleur
895fe63d3b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-07-24 01:53:51 +02:00
Laurent Destailleur
e0d22b739d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/product/stock/class/entrepot.class.php
 2020-07-24 01:53:24 +02:00
Laurent Destailleur
d823bb73c0 Change order of fields for mass stock movement 2020-07-20 01:01:40 +02:00
Laurent Destailleur
e5688e2641 Fix phpcs 2020-07-19 02:54:25 +02:00
Laurent Destailleur
87cd4b11bd Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2020-07-19 02:24:38 +02:00
Laurent Destailleur
8d26329653 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop 
Conflicts:
	htdocs/core/lib/price.lib.php
	htdocs/projet/activity/perday.php
 2020-07-19 02:24:26 +02:00
Laurent Destailleur
e17fbf9dcd
Merge pull request #14206 from atm-josselin/NEW_show_label_on_batch_card 
NEW Show label on batch card
 2020-07-19 02:03:46 +02:00
Laurent Destailleur
6fdd5ea73a Not required 2020-07-19 01:31:51 +02:00
Laurent Destailleur
ee74740384 FIX #14259 2020-07-19 01:29:42 +02:00
Laurent Destailleur
384cb22d3a
Merge pull request #14220 from FHenry/11.0 
fix missing entity into fetch wharehouse
 2020-07-18 19:32:24 +02:00
florian HENRY
f4074428f8 fix filter wharehouse list on ref 2020-07-14 09:38:52 +02:00