Laurent Destailleur
89dfb9baf8
Merge pull request #14887 from cfoellmann/fix-origin-user
...
handle fk_origin for stock movement for users the core way
2020-10-01 19:15:01 +02:00
Christian Foellmann
a890b2d7ad
handle fk_origin for stock movement for users the core way
2020-10-01 12:31:00 +02:00
Laurent Destailleur
7b3a7c9921
Add token on all url with action=delete
2020-10-01 10:50:54 +02:00
stickler-ci
e558dc3f27
Fixing style errors.
2020-10-01 07:48:24 +00:00
John Botella
c16cd91d8e
FIX default accountancy values and posted values
2020-10-01 09:40:11 +02:00
Laurent Destailleur
f442dac2c9
Add token on most GET url for admin action
2020-09-30 15:13:28 +02:00
Florian HENRY
6b539dfad0
fix remove php warning non-numeric value
2020-09-30 13:53:27 +02:00
geoffrey.girard
8c017ad422
ADD : Filters more filters on customer price tab
2020-09-30 13:33:05 +02:00
Cédric
572b012344
Fix API $includeparentid when get product
2020-09-28 22:06:15 +02:00
Sekan, Tobias
2bf15b3a92
Show category filter only on rights to read it
2020-09-28 10:42:49 +02:00
Laurent Destailleur
c659379307
Try a more complete fix than #14821
2020-09-27 17:21:49 +02:00
Laurent Destailleur
ca8d9613ce
Merge pull request #14821 from cfoellmann/fix-pricestable
...
fix selectbox for table columns supplier prices
2020-09-27 17:12:37 +02:00
Laurent Destailleur
3c6dda9dd5
Clean code
2020-09-25 10:27:30 +02:00
Christian Foellmann
be05a44860
fix selectbox for table columns supplier prices
2020-09-24 11:49:59 +02:00
Laurent Destailleur
a16788f753
Fix syntax error
2020-09-24 00:06:02 +02:00
Laurent Destailleur
ece46511f2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-09-23 23:02:52 +02:00
Laurent Destailleur
95cf3d2f51
NEW Can use desired stock of a given warehouse for replenishment
2020-09-23 23:02:31 +02:00
Laurent Destailleur
6f919f1dd0
Merge branch 'develop' into PreselectThirpartyOnNewFromList
2020-09-23 20:02:48 +02:00
Laurent Destailleur
09c6761dae
NEW Include the tag editor of page as a popup into website editor
2020-09-23 16:36:19 +02:00
Tobias Sekan
a72519f353
Merge branch 'develop' into PreselectThirpartyOnNewFromList
2020-09-23 09:09:42 +02:00
Laurent Destailleur
d5d187c793
Fix phpunit
2020-09-21 01:31:35 +02:00
Laurent Destailleur
19141b3eb9
Merge pull request #14633 from c3do/patch-6
...
NEW Improve Product API for variant products
2020-09-20 19:34:12 +02:00
Laurent Destailleur
9522b12da1
Update api_products.class.php
2020-09-20 19:33:18 +02:00
Laurent Destailleur
dccdfd3a53
Merge pull request #14766 from ptibogxiv/patch-361
...
FIx product list
2020-09-20 17:18:29 +02:00
Laurent Destailleur
0e4d3c19dd
Fix escaping
2020-09-20 02:57:15 +02:00
Laurent Destailleur
216b3c885d
Fix escaping
2020-09-20 01:30:36 +02:00
Laurent Destailleur
4e2aff2cdc
Fix sql injection when forging requests with IN
2020-09-18 17:28:02 +02:00
Laurent Destailleur
2d38644ae1
Sanitize sortfield
2020-09-18 17:13:01 +02:00
Tobias Sekan
b2a953ed5b
Merge branch 'develop' into PreselectThirpartyOnNewFromList
2020-09-18 12:21:41 +02:00
Sekan, Tobias
eac9e54e0b
fix more different button visibility
2020-09-18 11:48:53 +02:00
Laurent Destailleur
b35db6b9dd
Clean code managing canvas
2020-09-18 06:02:52 +02:00
Laurent Destailleur
c4b5f5a249
Maxi clean of code
2020-09-18 01:29:17 +02:00
ptibogxiv
08d7973b4a
Update list.php
2020-09-17 22:10:22 +02:00
ptibogxiv
cbd511fbb4
Update list.php
2020-09-17 16:16:35 +02:00
Laurent Destailleur
9a758b7edd
FIX #yogosha4483
2020-09-17 14:31:25 +02:00
Cédric
75b46dd535
Update api_products.class.php
2020-09-17 12:45:20 +02:00
Cédric
2b6a6e12e3
Update api_products.class.php
2020-09-17 12:43:04 +02:00
Laurent Destailleur
0bf0312d50
FIX #yogosha4448
2020-09-17 12:30:14 +02:00
ptibogxiv
8284d0ee06
FIx product list
...
fix mistake if fk_state empty
2020-09-17 11:41:53 +02:00
Laurent Destailleur
5daba4b0ed
Merge pull request #14752 from ptibogxiv/patch-360
...
NEW filter product list by country and/or state/province
2020-09-17 11:21:23 +02:00
Laurent Destailleur
bfbb217607
Fix GETPOST on 'action'
2020-09-16 19:39:50 +02:00
ptibogxiv
6f564c1937
NEW filter product list by country and/or state/province
2020-09-16 12:34:07 +02:00
Laurent Destailleur
382a4552eb
Fix css
2020-09-16 03:39:03 +02:00
Laurent Destailleur
adeed1464d
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-09-16 02:56:09 +02:00
Laurent Destailleur
baa46cd502
Fix syntax error
2020-09-16 02:53:44 +02:00
Laurent Destailleur
d954de2d35
Merge pull request #14732 from ptibogxiv/patch-359
...
NEW add State/Province origin for products
2020-09-16 01:02:00 +02:00
stickler-ci
b3f78100bf
Fixing style errors.
2020-09-15 23:01:00 +00:00
Laurent Destailleur
9e494d0bb3
Update card.php
2020-09-16 00:59:23 +02:00
Laurent Destailleur
b7b1de4580
Fix position of GPAO must be after Product.
...
CSS
2020-09-15 02:41:08 +02:00
Laurent Destailleur
6dd1f522eb
CSS
2020-09-14 22:30:22 +02:00
Laurent Destailleur
7712b277a6
Look and feel v13
2020-09-14 21:55:25 +02:00
stickler-ci
ad84aaacc6
Fixing style errors.
2020-09-14 09:01:11 +00:00
ptibogxiv
92aab677e9
Update product.class.php
2020-09-14 10:59:09 +02:00
ptibogxiv
de31920f28
NEW add state origin for product
...
usefull for food, fruits or vegetables or regional product
soon in other PR i will push filter by state or country in product list
2020-09-14 10:57:51 +02:00
Florian Mortgat
4c6b0ed5b5
FIX 12.0 - round value of virtual stock on product stock reassort list
2020-09-14 10:49:44 +02:00
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
stickler-ci
d743cb6ac2
Fixing style errors.
2020-09-04 11:22:22 +00:00
Laurent Destailleur
35c0bc81e2
Update api_products.class.php
2020-09-04 13:21:10 +02:00
Laurent Destailleur
8e2001a09b
Update api_products.class.php
2020-09-04 13:20:03 +02:00
Laurent Destailleur
9cafd3b97f
Update api_products.class.php
2020-09-04 13:10:30 +02:00
stickler-ci
52c057b9dd
Fixing style errors.
2020-09-04 11:06:43 +00:00
Laurent Destailleur
a98c5b9841
Update api_products.class.php
2020-09-04 13:05:30 +02:00
stickler-ci
962bb0c698
Fixing style errors.
2020-09-04 10:59:38 +00:00
Laurent Destailleur
a93cbafe58
Update api_products.class.php
2020-09-04 12:58:30 +02:00
stickler-ci
d6bf70300a
Fixing style errors.
2020-09-04 10:57:21 +00:00
Laurent Destailleur
a6f6db6b54
Update api_products.class.php
2020-09-04 12:56:06 +02:00
stickler-ci
334224cd2d
Fixing style errors.
2020-09-04 10:55:34 +00:00
Laurent Destailleur
606217fefc
Debug
2020-09-04 12:54:23 +02:00
stickler-ci
8026ee15df
Fixing style errors.
2020-09-04 10:52:55 +00:00
Laurent Destailleur
8ca08de5e6
Debug
2020-09-04 12:51:44 +02:00
Laurent Destailleur
b329a9d886
Update api_products.class.php
2020-09-04 12:45:09 +02:00
Laurent Destailleur
e5633e07a2
Update api_products.class.php
2020-09-04 12:28:47 +02:00
Cédric
704b83c79a
Multiple fix and features
...
NEW ref_ext for Attributes and Combinations
Clean and improved results for ::getAttributeValues ::getAttributes ::getAttributesById ::getAttributesByRef
FIX delete subproduct endpoint url
2020-09-04 12:24:57 +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
Laurent Destailleur
816aeadcba
Merge pull request #14465 from atm-john/develop_declinaison_price_multiple_merge
...
NEW : Declinaison price level compatibility
2020-08-16 23:18:49 +02:00
Laurent Destailleur
d8c6e17efd
Fix travis
2020-08-14 11:59:51 +02:00
Laurent Destailleur
a916f6af59
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
2020-08-14 11:09:06 +02:00
Laurent Destailleur
0381cf5665
Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop
...
Conflicts:
htdocs/core/modules/modPaymentByBankTransfer.class.php
htdocs/filefunc.inc.php
2020-08-14 11:08:53 +02:00
Laurent Destailleur
056a503200
Merge branch '11.0' of https://github.com/dolibarr/dolibarr into 12.0
...
Conflicts:
htdocs/product/composition/card.php
2020-08-14 11:06:39 +02:00
Laurent Destailleur
a2f50770f8
Merge pull request #14449 from cfoellmann/default-unit
...
set default unit to `PRODUCT_USE_UNITS` value
2020-08-14 03:04:09 +02:00
John Botella
41cbe6db12
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_declinaison_price_multiple_merge
2020-08-12 10:39:21 +02:00
John Botella
f0268b4aaf
Add declinaison price level
2020-08-12 10:14:29 +02:00
atm-thibaultf
10810bc5bb
Modify int to float for stock limit alert and desired stock
2020-08-12 09:09:59 +02:00
Christian Foellmann
821e7e2894
set default unit to PRODUCT_USE_UNITS value
2020-08-10 15:39:05 +02:00
stickler-ci
d7a65a540e
Fixing style errors.
2020-08-08 20:58:51 +00:00
Cédric
9b00a1f61a
Some updates for attributes triggers
2020-08-08 22:48:21 +02:00
Laurent Destailleur
b5749af5b4
Merge pull request #14379 from fappels/12_fix_search_stock_list
...
FIX filter warehouse list on status
2020-08-08 02:25:54 +02:00
Laurent Destailleur
6f7b65d9f2
css
2020-08-07 20:44:49 +02:00
Laurent Destailleur
aa699bacc6
css
2020-08-07 20:10:31 +02:00
Francis Appels
dec0e418e3
Convert search key status to class key statut.
...
Add comment to refactor class statut to class status
2020-08-07 15:11:36 +02:00
Laurent Destailleur
dd773d33fd
Fix phpcs
2020-08-07 14:57:52 +02:00
Francis Appels
4376ca4c94
Revert "Fix filter warehouse list on status"
...
This reverts commit 587ca48312
2020-08-07 14:16:49 +02:00
Egils Consulting
9c254159ab
Update api_products.class.php
...
fixes #14309
Throw 400 and add hint to user about using the right endpoint.
2020-08-07 00:06:48 +02:00
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
Francis Appels
587ca48312
Fix filter warehouse list on status
2020-08-04 17:25:35 +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
florian HENRY
32e4635e84
fix missing entity into fetch wharehouse
2020-07-12 21:34:13 +02:00
florian HENRY
7b5072a21b
fix missing entity
2020-07-12 10:10:46 +02:00
florian HENRY
2f8968478d
fix missing entity into fetch wahrehouse
2020-07-12 10:06:04 +02:00
Laurent Destailleur
8972271be0
Add link to stock at date page
2020-07-10 21:12:15 +02:00
Laurent Destailleur
c91236244e
Enhance Stock at date feature
2020-07-10 20:33:06 +02:00
Laurent Destailleur
a155b20b2f
Trans
2020-07-10 16:27:59 +02:00
Laurent Destailleur
2dc1008663
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-07-10 05:21:40 +02:00
Laurent Destailleur
c3375b176d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
2020-07-10 05:21:01 +02:00
Laurent Destailleur
ff5a2d459d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-07-10 05:20:09 +02:00
Laurent Destailleur
96c583b84e
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-07-10 02:28:34 +02:00
gauthier
25509e74d3
FIX : order by amount ht uses wrong column
2020-07-09 17:27:14 +02:00
atm-josselin
71a5cc7522
Show label on batch card
2020-07-09 17:13:53 +02:00
Laurent Destailleur
6b5f46624c
Fix label of AWP
2020-07-09 16:19:40 +02:00
Laurent Destailleur
a59b37cb72
Trans
2020-07-09 15:44:42 +02:00
Laurent Destailleur
5ea47f3ade
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/resultat/index.php
htdocs/product/admin/product.php
htdocs/projet/tasks/list.php
2020-07-08 18:11:58 +02:00
Laurent Destailleur
7d7ef1e72a
FIX option PRODUIT_CUSTOMER_PRICES_BY_QTY
...
Fix setup of product
2020-07-06 15:34:26 +02:00
Laurent Destailleur
1e7daa29a5
Hide a useless option
2020-07-03 01:46:50 +02:00
Laurent Destailleur
636f1e642d
Fix param of product id to switch to list of order
2020-07-03 01:31:48 +02:00
Laurent Destailleur
fce81a4bf1
Rename var and fix position of checkbox
2020-07-03 01:30:53 +02:00
Laurent Destailleur
6b3eeebe87
Merge branch 'develop' into dev-replenish
2020-07-03 01:03:35 +02:00
Laurent Destailleur
4baa00ba89
Fix phpcs
2020-06-30 13:20:46 +02:00
Laurent Destailleur
518c126abf
NEW Add a page to list Stock at a given date.
2020-06-28 20:31:07 +02:00
Laurent Destailleur
a3ae7a76b8
WIP Stock at date
2020-06-28 19:35:24 +02:00
Laurent Destailleur
d22a0f702e
WIP Stock at date
2020-06-28 17:34:30 +02:00
Laurent Destailleur
90d4458aab
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2020-06-27 00:38:51 +02:00
Laurent Destailleur
6df049e05c
FIX #14112
2020-06-26 20:35:06 +02:00
Laurent Destailleur
c32151d356
Prepare page for stock at date
2020-06-25 01:07:30 +02:00
Laurent Destailleur
501fd2f7a3
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/takepos/admin/receipt.php
2020-06-21 20:48:41 +02:00
Laurent Destailleur
fe1f88d2ac
FIX #14092 #14093
2020-06-20 16:09:53 +02:00
Laurent Destailleur
01914980d9
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/public/notice.php
2020-06-19 00:45:06 +02:00
Laurent Destailleur
623a9db4e7
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/product/composition/card.php
htdocs/public/notice.php
2020-06-19 00:42:20 +02:00
Laurent Destailleur
de5a2d738b
FIX #14001
2020-06-17 18:39:25 +02:00
Anthony Berton
bda4753e41
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE
2020-06-11 18:44:38 +02:00
Laurent Destailleur
5794b1abea
Fix for use with text browser
...
Conflicts:
htdocs/main.inc.php
2020-06-10 12:46:55 +02:00
Laurent Destailleur
bd22ad4174
Fix for use with text browser
2020-06-10 12:35:39 +02:00
Laurent Destailleur
ff9312c96a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/card.php
htdocs/compta/prelevement/class/ligneprelevement.class.php
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/line.php
2020-06-08 20:36:54 +02:00
Laurent Destailleur
233c7e53f1
Debug v12
2020-06-08 20:31:09 +02:00
Laurent Destailleur
6f12488e30
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/filefunc.inc.php
2020-06-07 19:55:48 +02:00
Marc Guenneugues
bd12972d7b
replenish : select expedition quantities only from opened orders when using virtual stocks
2020-06-07 14:14:11 +02:00
Laurent Destailleur
da672c8776
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/admin/translation.php
htdocs/core/class/html.formfile.class.php
htdocs/societe/card.php
2020-06-06 11:57:31 +02:00
Laurent Destailleur
a305c43901
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/societe/card.php
htdocs/ticket/card.php
2020-06-06 11:51:39 +02:00
Marc Guenneugues
cefc8dcca2
replenish : select expedition quantities only from opened orders when using virtual stocks
2020-06-06 11:39:49 +02:00
Laurent Destailleur
2344435416
Fix XSS CWE-ID CWE-79
2020-06-05 23:41:29 +02:00
Laurent Destailleur
a59961dae6
Fix td alignment
2020-06-05 23:06:59 +02:00
Laurent Destailleur
b75700cc0b
Fix virtualstock activation when MRP module is on
2020-06-05 10:27:34 +02:00
Laurent Destailleur
474860d546
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-03 14:06:35 +02:00
Laurent Destailleur
7b84518e59
Fix webp support
2020-06-03 14:05:18 +02:00
Laurent Destailleur
f92426034f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/website/index.php
2020-06-03 01:06:27 +02:00
Laurent Destailleur
3b4fe0d582
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/langs/en_US/main.lang
htdocs/product/class/html.formproduct.class.php
2020-06-02 13:31:22 +02:00
Laurent Destailleur
009780b895
Update html.formproduct.class.php
2020-06-02 12:13:55 +02:00
Laurent Destailleur
88a831c05a
Update html.formproduct.class.php
2020-06-02 12:12:07 +02:00
atm-lena
ae9c490134
Merge branch '11.0' of https://github.com/Dolibarr/dolibarr into 11.0_NEW_AddHook_SelectWarehouses
2020-06-02 09:55:56 +02:00
atm-lena
99b4bfc91e
Movement of hook "selectwarehouse"
2020-06-02 09:53:30 +02:00
Laurent Destailleur
ebc65f7df7
Update stockcorrection.tpl.php
2020-06-01 21:05:32 +02:00
Bahfir Abbes
819984cfe0
replace with better normalized constant
2020-05-31 00:43:05 +01:00
stickler-ci
0813329070
Fixing style errors.
2020-05-30 23:39:16 +00:00
bahfir abbes
5873d41f64
Fix: DEFAULT_WAREHOUSE to define default in warehouse selections
2020-05-31 00:36:33 +01:00
Laurent Destailleur
82455681d6
Merge pull request #13582 from TobiasSekan/UseCatApiForProjectList
...
NEW Use new category API for project list view
2020-05-30 17:22:43 +02:00
Laurent Destailleur
cf924e11e9
Merge pull request #13825 from bb2a/Add-option-in-stock-for-affect-warehouse-
...
NEW Add option to define a default warehouse at user level
2020-05-28 18:41:54 +02:00
Laurent Destailleur
f66555b396
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-27 23:38:46 +02:00
Laurent Destailleur
2bababb73e
Fix doc
2020-05-27 23:30:52 +02:00
Anthony Berton
c0b6fd1811
Update html.formproduct.class.php
2020-05-27 22:35:55 +02:00
Anthony Berton
9efcc631d7
Merge branch 'develop' into Add-option-in-stock-for-affect-warehouse-
2020-05-27 14:47:20 +02:00
Laurent Destailleur
b6308f6dfa
Fix phpcs
2020-05-26 01:16:18 +02:00
Laurent Destailleur
ab176cd078
Merge pull request #13937 from frederic34/Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
...
add new rule
2020-05-26 00:20:12 +02:00
Laurent Destailleur
4d13fa532f
Merge pull request #13852 from bb2a/MultiPriceInListe
...
Add columns for multiprices in product list
2020-05-25 22:50:16 +02:00
Laurent Destailleur
49c4ed5a08
Update list.php
2020-05-25 22:50:00 +02:00
Frédéric FRANCE
e5402988d9
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-24 17:58:18 +02:00
Laurent Destailleur
fd61214b97
Merge
2020-05-24 01:06:45 +02:00
Laurent Destailleur
6056ed2755
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/holiday/class/holiday.class.php
htdocs/index.php
2020-05-24 01:02:08 +02:00
Frédéric FRANCE
67b8ab13c9
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-23 21:45:18 +02:00
Frédéric FRANCE
174ddc5fd4
prepare new rule
2020-05-23 21:07:47 +02:00
Laurent Destailleur
024e62a582
Fix navigation
2020-05-23 20:27:25 +02:00
Laurent Destailleur
7bfbf3c88b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/holiday/class/holiday.class.php
htdocs/index.php
2020-05-23 20:20:53 +02:00
Laurent Destailleur
28bd962559
Merge pull request #13703 from frederic34/entrepotlibelle
...
remove deprecated libelle to fix phpunit
2020-05-23 19:25:04 +02:00
Frédéric FRANCE
5aa84c64d0
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-23 18:54:33 +02:00
Laurent Destailleur
c2b2e17b58
Merge pull request #13917 from atm-quentin/NEW_showfullarbo_in_getnomurl
...
NEW conf to allow show full arbo in warehouse getnomurl
2020-05-23 15:05:08 +02:00
Laurent Destailleur
b4ceb2e97e
Update entrepot.class.php
2020-05-23 15:00:06 +02:00
Laurent Destailleur
4004aeb257
Merge pull request #13915 from atm-quentin/Fix_missing_getnomurl_warehouse_hook
...
FIX missing GetNomURL Hook in warehouse class
2020-05-23 14:57:28 +02:00
Frédéric FRANCE
0f4f727d18
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-22 08:27:12 +02:00
Laurent Destailleur
5d78f6dac5
NEW Add link to edit property from search result of website pages
2020-05-22 00:38:01 +02:00
Frédéric FRANCE
b41ac00b98
add new rule
2020-05-21 15:05:19 +02:00
Frédéric FRANCE
a25ed0e041
add new rule
2020-05-21 01:56:06 +02:00
Frédéric FRANCE
cd240efadf
Update entrepot.class.php
2020-05-19 21:28:47 +02:00
stickler-ci
0ac82797e7
Fixing style errors.
2020-05-19 19:14:20 +00:00
Frédéric FRANCE
f2ac1992cd
Merge branch 'develop' into entrepotlibelle
2020-05-19 21:13:33 +02:00
atm-lena
bf9756b8c4
Add Hook "Massstockmove"
2020-05-19 16:05:13 +02:00
atm-lena
e042807b32
Add $this to parameters
2020-05-19 15:58:16 +02:00
atm-lena
3f28c9a461
Add parameters to hook
2020-05-19 15:31:37 +02:00
atm-lena
987fb806c6
Exclude array param
2020-05-19 15:24:53 +02:00
atm-lena
f518bafda9
11.0 - Add Hook "SelectWarehouses"
2020-05-19 15:17:06 +02:00
atm-quentin
d61cef28d7
NEW conf to allow show full arbo in getnomurl
2020-05-19 11:16:04 +02:00
atm-quentin
e39774a508
add more hook param
2020-05-19 10:05:26 +02:00
atm-quentin
f073b7023a
FIX missing GetNomURL Hook in warehouse class
2020-05-19 09:52:33 +02:00
Anthony Berton
ceb3ba0e33
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE
2020-05-16 16:42:20 +02:00
Langlais115
dc6ae70aa6
Fix #13805
...
Add proper type check to "seuil_stock_alerte" parameter.
2020-05-15 14:00:26 +02:00
Anthony Berton
06c08ad045
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE
2020-05-14 15:26:58 +02:00
stickler-ci
e3afa65880
Fixing style errors.
2020-05-14 09:38:27 +00:00
Anthony Berton
36b63ed921
Update list.php
2020-05-14 11:37:26 +02:00
Laurent Destailleur
b5f3be4599
Clean phpcs rule file
2020-05-13 00:29:46 +02:00
Laurent Destailleur
2bf91c0f37
Merge pull request #13857 from bb2a/Link-phone-warehouse
...
Links phone on warehouse liste
2020-05-12 03:09:16 +02:00
Laurent Destailleur
92d137cde9
Update list.php
2020-05-12 03:09:04 +02:00
Laurent Destailleur
f6ac2d2545
Merge pull request #13866 from Tim-Otte/fix-11948
...
FIX #11948
2020-05-12 03:07:53 +02:00
Laurent Destailleur
a099858385
Update product.class.php
2020-05-12 03:07:23 +02:00
Laurent Destailleur
d459f9902c
Update card.php
2020-05-12 03:06:30 +02:00
Laurent Destailleur
4584fa1aa6
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/asset/list.php
htdocs/compta/bank/list.php
htdocs/contrat/services_list.php
htdocs/core/lib/date.lib.php
htdocs/expensereport/list.php
htdocs/fichinter/list.php
htdocs/holiday/list.php
htdocs/projet/tasks/list.php
htdocs/supplier_proposal/list.php
htdocs/user/list.php
2020-05-11 19:43:06 +02:00
Tim Otte
65011c2877
Fixed the product unit translation
2020-05-11 15:11:23 +02:00
Anthony Berton
53eb891a88
Update list.php
2020-05-09 18:48:01 +02:00
Anthony Berton
52b47fd598
Update list.php
2020-05-09 00:28:23 +02:00
stickler-ci
c2dff7dfed
Fixing style errors.
2020-05-08 20:46:06 +00:00
Anthony Berton
a87d9cd740
Update list.php
2020-05-08 22:41:49 +02:00
Maxime Kohlhaas
1a9afe6b20
Fix missing hook params for printFieldListValue
2020-05-08 01:40:25 +02:00
Laurent Destailleur
3dbe9a4af1
Fix label
2020-05-06 13:59:15 +02:00
Anthony Berton
eb411d16ab
Update html.formproduct.class.php
2020-05-06 00:58:51 +02:00
Anthony Berton
c6d2a1faf3
Add options
...
Add options in module stock
2020-05-06 00:48:00 +02:00
Laurent Destailleur
b2a9791dca
Fix pagination on pages "Related items"
2020-05-05 16:33:02 +02:00
Laurent Destailleur
535ae612f3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-03 22:48:48 +02:00
Laurent Destailleur
4d6a45d491
Major doxygen fix
2020-05-03 22:48:35 +02:00
Laurent Destailleur
33669b6fd8
Update html.formproduct.class.php
2020-05-03 21:15:23 +02:00
stickler-ci
56a5e8ca3c
Fixing style errors.
2020-05-03 17:50:10 +00:00
Anthony Berton
485ef522d2
Add option HT TTC créate product
2020-05-03 19:47:10 +02:00
stickler-ci
080db7629f
Fixing style errors.
2020-05-03 15:21:00 +00:00
Anthony Berton
f42492764d
Update html.formproduct.class.php
...
DEFAULT_WAREHOUSE is not select in sherch
2020-05-03 17:16:25 +02:00
Laurent Destailleur
a88ab40384
Clean phpcs
2020-05-02 15:18:59 +02:00
Marc Guenneugues
bac17d6b95
Merge branch 'dev-replenish' of https://github.com/simicar29/dolibarr into dev-replenish
2020-05-02 09:27:22 +02:00
Marc Guenneugues
b65a4649e7
Correct lint errors
2020-05-02 09:26:58 +02:00
stickler-ci
1e3f31041d
Fixing style errors.
2020-05-02 07:23:06 +00:00
Marc Guenneugues
a03739962b
Propagate the value of limit
2020-05-02 09:21:51 +02:00
Marc Guenneugues
640730539e
NEW: Add option to include products without alert in replenish
2020-05-02 08:50:22 +02:00
Scrutinizer Auto-Fixer
8f0e00b4aa
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-05-02 01:39:56 +00:00
Laurent Destailleur
90bbb9beac
Fix API to delete purchase price
2020-05-02 03:33:33 +02:00
Laurent Destailleur
4606b9fd9f
Fix name of class Service (already used by APIs)
2020-05-02 03:29:33 +02:00
Laurent Destailleur
ed045b2673
FIX #13749
2020-04-27 15:04:31 +02:00
Laurent Destailleur
a1142f884d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-27 15:03:34 +02:00
Laurent Destailleur
50d9f466d4
FIX #13749
2020-04-27 14:38:45 +02:00
Laurent Destailleur
1c70e49695
Merge branch 'develop' into 12.0_a23
2020-04-27 14:14:13 +02:00
Laurent Destailleur
31157931a9
Fix phpcs
2020-04-26 23:52:23 +02:00
Laurent Destailleur
b20d85b198
Fix phpcs
2020-04-26 23:06:52 +02:00
Laurent Destailleur
6caa872280
Enable more PHPCS rules
2020-04-25 19:27:42 +02:00
Scrutinizer Auto-Fixer
1bf5745286
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-25 11:52:07 +00:00
Laurent Destailleur
3ed11f374a
Look and feel v12
2020-04-24 23:56:57 +02:00
Laurent Destailleur
7bbfd2175d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.dispatch.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/reception/class/reception.class.php
2020-04-24 18:58:47 +02:00
Laurent Destailleur
997c2344cb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-23 20:03:52 +02:00
Laurent Destailleur
2ba6e65feb
Fix label
2020-04-23 20:03:41 +02:00
Scrutinizer Auto-Fixer
548f3007cf
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-23 16:55:10 +00:00
Laurent Destailleur
02c5530e1f
Update mouvementstock.class.php
2020-04-23 18:31:01 +02:00
Frédéric FRANCE
2098021010
Merge remote-tracking branch 'upstream/develop' into entrepotlibelle
2020-04-23 14:10:39 +02:00
Laurent Destailleur
defef24c3c
Fix regression
2020-04-23 13:57:27 +02:00
Laurent Destailleur
72c6ac1c72
Complete #13708 , normalization of code
2020-04-23 13:21:39 +02:00
Juanjo Menent
0999f5e6f2
FIX: Error update SQL into stock reception
2020-04-23 12:12:50 +02:00
Frédéric FRANCE
3541020912
remove deprecated libelle
2020-04-23 00:13:51 +02:00
Frédéric FRANCE
2349c2be22
remove deprecated libelle
2020-04-22 23:55:50 +02:00
Frédéric FRANCE
061f4623b3
remove deprecated libelle
2020-04-22 23:53:00 +02:00
Laurent Destailleur
a7641cdb90
CSS
2020-04-22 22:02:25 +02:00
Laurent Destailleur
245f89ceaa
Look and feel v12
2020-04-22 21:28:23 +02:00
Laurent Destailleur
496d8f354f
Look and feel v12
2020-04-22 17:59:54 +02:00
Laurent Destailleur
67a7d6b77d
Look and feel v12
2020-04-20 15:57:15 +02:00
Laurent Destailleur
16e46c672c
Clean code
2020-04-20 15:06:27 +02:00
Laurent Destailleur
f816fae86c
Fix a duplicated index
2020-04-20 12:21:13 +02:00
Laurent Destailleur
d176840bfb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-16 16:02:28 +02:00
Laurent Destailleur
3c29a7b8d8
Fix phpcs
2020-04-16 16:02:06 +02:00
Laurent Destailleur
5254a94038
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/ldap.php
htdocs/commande/class/commande.class.php
htdocs/commande/index.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/expedition/list.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/list.php
htdocs/loan/list.php
htdocs/product/class/product.class.php
htdocs/supplier_proposal/list.php
2020-04-16 15:58:59 +02:00
Pierre Ardoin
19c85785f7
Fix
2020-04-16 13:26:55 +02:00
Pierre Ardoin
e85b4a5a20
FIX Directory Issue with Multicompany
...
Before : Cannot show documents added entity who created the product/service
Now : show all files.
Warning : all products must be generated in $object->entity directory and not in $conf->entity.
2020-04-16 12:15:41 +02:00
Laurent Destailleur
c413013db8
Merge pull request #13625 from ptibogxiv/patch-333
...
NEW API filter warehouses by categorie
2020-04-16 01:01:44 +02:00
Laurent Destailleur
7f746af10e
Merge pull request #13620 from atm-quentin/FIX_draftordered_replenish
...
FIX draftordered replenish virtual stock
2020-04-16 00:58:23 +02:00
Laurent Destailleur
43c48727e2
Fix var_dump
2020-04-15 23:44:07 +02:00
stickler-ci
7a8db9c7d9
Fixing style errors.
2020-04-15 16:41:42 +00:00
ptibogxiv
0c106cbc12
NEW API filter warehouses by categorie
2020-04-15 18:40:01 +02:00
atm-quentin
18fdf3573f
FIX draftordered replenish virtual stock
2020-04-15 16:05:50 +02:00
Laurent Destailleur
dc86f9528d
Fix MRP module
2020-04-13 18:10:20 +02:00
Laurent Destailleur
3740d59848
Look and feel v12
2020-04-13 04:14:28 +02:00
Laurent Destailleur
cdc8eb27fb
Look and feel v12
2020-04-12 21:45:43 +02:00
Laurent Destailleur
549b126eff
Look and feel v12
2020-04-12 21:36:57 +02:00
Laurent Destailleur
ed51ce8734
Look and feel v12
2020-04-12 19:56:50 +02:00
Laurent Destailleur
422e33a68b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/ihm.php
htdocs/comm/action/class/actioncomm.class.php
htdocs/compta/stats/cabyprodserv.php
htdocs/filefunc.inc.php
htdocs/takepos/invoice.php
2020-04-12 17:01:44 +02:00
Sekan, Tobias
ab870dd532
Switch to new category API in project list view
2020-04-12 13:30:02 +02:00
Maxime Kohlhaas
8bca68cfba
Fix missing token on product composition
2020-04-12 10:39:16 +02:00
Scrutinizer Auto-Fixer
444c293c01
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-10 08:59:32 +00:00
Laurent Destailleur
a2a89637a2
Fix phpcs
2020-04-10 10:53:41 +02:00
Laurent Destailleur
4ff503d20a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/list.php
htdocs/supplier_proposal/list.php
2020-04-10 02:07:51 +02:00
Laurent Destailleur
5a366767fb
Fix phpcs
2020-04-10 01:47:50 +02:00
Laurent Destailleur
7fe8c7eab3
FIX #11855
2020-04-10 01:37:04 +02:00
Laurent Destailleur
83af4ebea4
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
htdocs/product/stock/class/entrepot.class.php
htdocs/product/stock/list.php
2020-04-10 01:22:22 +02:00
Laurent Destailleur
273443550e
Fix list in warehouse
2020-04-10 01:21:59 +02:00
Laurent Destailleur
f7d1ce1e09
FIX Can use decimal value in virtual products
2020-04-10 00:26:09 +02:00
Laurent Destailleur
80862f7173
FIX Can use decimal value in virtual products
2020-04-10 00:25:30 +02:00
Laurent Destailleur
1ed8639653
Merge pull request #13532 from atm-quentin/11_fix_buyprice_extrafield_langfile_and_tooltip
...
FIX buyprice extrafield langfile and tooltip
2020-04-09 19:49:32 +02:00
Francis Appels
caecb0152f
Fix set default warehouse list columns
2020-04-09 14:46:20 +02:00
stickler-ci
50b789456d
Fixing style errors.
2020-04-08 14:03:16 +00:00
atm-quentin
64f6542f96
FIX buyprice extrafield langfile and tooltip
2020-04-08 15:59:10 +02:00
Frédéric FRANCE
fc34b5a4cb
compress png with zopflipng
2020-04-06 19:03:48 +02:00
ATM john
88297d5682
fix key
2020-04-06 13:20:42 +02:00
ATM john
721371a08c
Fix warehouse list
2020-04-06 13:08:03 +02:00
Laurent Destailleur
b1c5490a74
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/tpl/extrafields_add.tpl.php
htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
2020-04-05 04:03:53 +02:00
Laurent Destailleur
50790a7f36
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/filefunc.inc.php
2020-04-05 03:44:06 +02:00
Laurent Destailleur
8a14652eae
Merge pull request #13449 from atm-quentin/FIX_missing_default_accountancy_product_buy_code
...
FIX missing default accountancy product buy code
2020-04-05 03:41:46 +02:00
Laurent Destailleur
99ddd25ad5
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-04-02 16:51:50 +02:00
Laurent Destailleur
d204cfe6c6
FIX Protection when database has a corrupted product id
2020-04-02 15:54:33 +02:00
Laurent Destailleur
84cda962c1
Clean dead code
2020-04-02 12:03:29 +02:00
Laurent Destailleur
5f8d9fc8e8
Merge pull request #13347 from bafbes/abb60311
...
NEW:Show units of products in stocks and hide total units if content is of diffents units
2020-03-30 20:01:59 +02:00
Laurent Destailleur
774137b937
Update card.php
2020-03-30 20:00:59 +02:00
Laurent Destailleur
401265d09e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-30 19:56:59 +02:00
Laurent Destailleur
3860f24908
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/product/class/product.class.php
2020-03-30 19:56:31 +02:00
Laurent Destailleur
d0c179e1e9
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-03-30 19:54:32 +02:00
Laurent Destailleur
fbce8fcfe3
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/product/class/product.class.php
2020-03-30 19:53:31 +02:00
Laurent Destailleur
125e964352
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/product/class/product.class.php
2020-03-30 19:50:47 +02:00
Laurent Destailleur
b081cf5cba
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/product/class/product.class.php
2020-03-30 19:48:41 +02:00
Laurent Destailleur
3ea9c297ea
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2020-03-30 19:46:23 +02:00
Laurent Destailleur
0b7b97ec34
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-30 19:43:03 +02:00
Laurent Destailleur
efaea37d61
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
2020-03-30 19:42:53 +02:00
Laurent Destailleur
1c7ce31207
Merge pull request #13435 from ptibogxiv/patch-316
...
FIX product get purchase prices
2020-03-30 19:20:32 +02:00
Laurent Destailleur
81b41c932f
Merge pull request #13432 from atm-quentin/FIX_reapro_11
...
FIX replenish stock to buy
2020-03-30 19:11:34 +02:00
Laurent Destailleur
45a237e31b
Merge pull request #13421 from atm-quentin/NEW_hook_product_load_stats
...
NEW hook on product load stats
2020-03-30 18:54:31 +02:00
atm-quentin
9a92545d8d
FIX missing default accountancy product buy code
2020-03-30 14:28:22 +02:00
Cédric
eead9a93d3
Fix can set desiredstock to (int) 0 from API Rest
...
When you set desiredstock to 0 as an integer from the API, it registers to null in the database. Using is_numeric() fixes this.
2020-03-30 13:03:13 +02:00
Laurent Destailleur
5fad4c8cb4
CSS
2020-03-29 19:41:01 +02:00
ptibogxiv
cb7342d4c8
FIX product purchase prices
...
Fix get datas but don't fix cleandata :( @eldy
2020-03-27 20:07:18 +01:00
Laurent Destailleur
4207d94f53
FIX Bad position of total in column
...
Conflicts:
htdocs/fourn/facture/paiement.php
2020-03-27 19:10:01 +01:00
Laurent Destailleur
a4797634d5
FIX Bad position of total in column
2020-03-27 19:08:39 +01:00
Laurent Destailleur
c27592bad2
Clean deprecated params on all fetch_optionals()
2020-03-27 16:02:58 +01:00
Laurent Destailleur
f512e0d161
Fix popup
2020-03-27 12:06:58 +01:00
Laurent Destailleur
975f061b43
Fix popup
2020-03-27 12:06:18 +01:00
Laurent Destailleur
3a9cc532d7
FIX Use getNomURL instead of hard coded link. Fix limit.
2020-03-27 11:56:59 +01:00
Laurent Destailleur
4f83eb59cd
FIX Use getNomURL instead of hard coded link. Fix limit.
2020-03-27 11:55:33 +01:00
atm-quentin
96481c3d52
FIX ordered stock already in $stock
2020-03-27 09:43:59 +01:00
Bahfir Abbes
f7ecc9d60c
Fix:The column "print $langs->trans("StockCorrection");" is now duplicated.
2020-03-26 15:22:24 +01:00
atm-quentin
cef65a3c8f
FIX hook name and useless inithook
2020-03-26 09:20:14 +01:00
Laurent Destailleur
20fad86520
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/cashcontrol/cashcontrol_card.php
2020-03-26 00:14:06 +01:00
Laurent Destailleur
51f8c5ca87
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/class/commoninvoice.class.php
htdocs/expensereport/list.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/product/fournisseurs.php
2020-03-25 19:01:56 +01:00
atm-quentin
e9ee78ab8f
NEW hook on product load stats
2020-03-25 11:20:54 +01:00
Alexandre SPANGARO
5528e9ef38
Work on split module fournisseur
2020-03-24 22:02:58 +01:00
Laurent Destailleur
a5379c7144
FIX All forms must use newToken()
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/cashcontrol/cashcontrol_card.php
htdocs/supplier_proposal/card.php
2020-03-24 13:14:23 +01:00
Laurent Destailleur
1ff15e1fd9
FIX All forms must use newToken()
2020-03-24 13:10:35 +01:00
Laurent Destailleur
c2f0cdc0f6
Look and feel v12. Several minor fixes
2020-03-23 19:35:14 +01:00
Scrutinizer Auto-Fixer
e8083e2a65
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-23 14:54:02 +00:00
Regis Houssin
45579b0986
FIX remove unused var, $usercancreate can be change by Multicompany
2020-03-23 07:01:23 +01:00
Laurent Destailleur
ef86311639
Merge pull request #13224 from mapiolca/patch-38
...
# Fix Compatibility with NOTMODIFYOTHERENTITYFOURNPRICE const.
2020-03-22 20:32:15 +01:00
Laurent Destailleur
23e06debb7
Popup is smaller
2020-03-22 11:52:02 +01:00
Bahfir Abbes
c9bdefbbe0
fix: delete redundant test+fix condition test+display units type if products in warehouse of same nature
2020-03-20 19:08:24 +01:00
Laurent Destailleur
222556b464
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/accounting-files.php
htdocs/core/lib/functions.lib.php
2020-03-19 22:09:17 +01:00
Laurent Destailleur
c71da5d013
FIX mass action on stock movements
2020-03-19 15:43:06 +01:00
stickler-ci
1bff748c94
Fixing style errors.
2020-03-18 00:24:40 +00:00
Anthony Berton
82058f3a78
add phone
2020-03-18 01:17:54 +01:00
Anthony Berton
9fa4f245cc
Update list.php
2020-03-18 00:03:26 +01:00
Pierre Ardoin
26f6f04486
forgot ";"
2020-03-17 10:08:18 +01:00
Pierre Ardoin
564f412957
correction due to comments @hregis and @eldy
2020-03-17 10:04:43 +01:00
Laurent Destailleur
4f442905b2
A new way to navigate between pages in list is available
2020-03-17 03:31:58 +01:00
stickler-ci
1f83e5ac54
Fixing style errors.
2020-03-15 21:30:46 +00:00
bahfir abbes
0ad68c180d
fix:Show units of products in stocks and hide total units if content is of diffents units
2020-03-15 22:26:23 +01:00
Laurent Destailleur
3b72005f93
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/card.php
htdocs/filefunc.inc.php
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/cashdesk.lang
htdocs/langs/fr_FR/errors.lang
htdocs/langs/fr_FR/products.lang
htdocs/langs/fr_FR/projects.lang
2020-03-14 00:22:11 +01:00
Laurent Destailleur
33c5db9cc3
Prepare code for the new pagination possibility
2020-03-13 13:07:11 +01:00
Laurent Destailleur
94589158c0
Move class from external project as internal class (project is dead)
2020-03-13 02:32:33 +01:00
Scrutinizer Auto-Fixer
f413ce6aac
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-12 11:45:44 +00:00
Laurent Destailleur
f38134e44d
Fix non transversable var
2020-03-12 12:42:34 +01:00
Laurent Destailleur
dfe947885c
FIX params of setEventMessage($langs->trans('ErrorProductClone')...
2020-03-12 12:40:28 +01:00
Laurent Destailleur
31865d7ae5
Fix doc
2020-03-12 12:39:21 +01:00
Laurent Destailleur
89a8531140
Merge pull request #13237 from aspangaro/12.0_a18
...
NEW: Accountancy - Add mode intra & export for product or service bought
2020-03-11 17:08:49 +01:00
Laurent Destailleur
47ebc2bbf2
Hide legend
2020-03-06 09:52:51 +01:00
Laurent Destailleur
0bd2740779
NEW Can force position of legend of graph on right (instead of top)
2020-03-05 17:23:19 +01:00
Laurent Destailleur
ddb26d7a8f
NEW Add graph type 'piesemicircle'
2020-03-05 16:30:55 +01:00
Laurent Destailleur
fc31680bd0
Several fix for chart.js graphs
2020-03-05 02:55:06 +01:00
Laurent Destailleur
aa1552dbc0
Enhance graphs
2020-03-05 00:17:16 +01:00
Laurent Destailleur
55093f9ff2
Merge pull request #13232 from TobiasSekan/NewCategoriesInStocks
...
NEW Category filter for warehouse list
2020-03-02 22:50:08 +01:00
Laurent Destailleur
46bf65704a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-02 21:59:56 +01:00
Laurent Destailleur
87fe2e691b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/product/stats/facture.php
htdocs/product/stats/facture_fournisseur.php
2020-03-02 21:59:34 +01:00
Sekan, Tobias
754058b990
Fix lint errors
2020-03-01 14:50:22 +01:00
Sekan, Tobias
0e55495c3e
adress feedback
2020-03-01 14:45:51 +01:00
Alexandre SPANGARO
da99c89c26
FIX: typo on ckeck method
2020-03-01 05:21:51 +01:00
Alexandre SPANGARO
6982997de5
Fix error
2020-03-01 05:09:57 +01:00
Alexandre SPANGARO
d9b9913e8a
NEW: Accountancy - Add mode intra & export for product or service bought
2020-03-01 04:52:12 +01:00
Laurent Destailleur
8879672122
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-29 12:52:18 +01:00
VESSILLER
8eff3162a9
FIX undefined function measuringUnitString in product list
2020-02-29 12:47:48 +01:00
Laurent Destailleur
dea8525a6c
NEW X-Axis on graph are show vertical when there is a lot of values.
2020-02-29 01:26:24 +01:00
Laurent Destailleur
56704e4029
Add stats of products in MO
2020-02-28 19:26:52 +01:00
Tobias Sekan
0e7e6f44e2
Update list.php
2020-02-28 16:16:05 +01:00
Laurent Destailleur
bfb9739ae8
Fix manufacuring efficiency on bom lines.
2020-02-28 16:12:42 +01:00
Tobias Sekan
bc8c709900
Add category filter for stocks
2020-02-28 16:03:35 +01:00
Pierre Ardoin
8476477137
add const NOTMODIFYOTHERENTITYFOURNPRICE
...
if const NOTMODIFYOTHERENTITYFOURNPRICE, can't modify other shared fourn prices.
2020-02-27 09:19:39 +01:00
Laurent Destailleur
0646b1a7a9
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/ihm.php
2020-02-26 17:04:14 +01:00
Laurent Destailleur
ef9fe73d96
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/index.php
2020-02-26 17:02:23 +01:00
Laurent Destailleur
85a4c4cf17
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-26 16:54:08 +01:00
Laurent Destailleur
25157649e2
Fix missing column
2020-02-26 16:53:58 +01:00
Laurent Destailleur
a17fba8321
Merge pull request #13158 from bb2a/patch-18
...
Default warehouse to create order
2020-02-26 16:45:25 +01:00
Tobias Sekan
0622024f61
Fix column selection on stocklist
2020-02-26 14:37:36 +01:00
atm-josselin
b2a488ef9f
FIX : Bad translation for productlot EatBy and SellBy
2020-02-24 11:00:55 +01:00
Laurent Destailleur
f931b92d36
Merge branch 'new-takepos-batch-decrement' of
...
https://github.com/OPEN-DSI/dolibarr into develop
# Conflicts:
# htdocs/langs/en_US/errors.lang
2020-02-23 22:49:03 +01:00
futurehousestore
16b4e680f7
Add Products/Services by popularity in Orders
2020-02-22 02:45:58 +00:00
Laurent Destailleur
badc4327c2
Merge branch 'develop' into patch-3
2020-02-21 19:45:33 +01:00
Laurent Destailleur
c2677c0231
Update api_products.class.php
2020-02-21 19:44:02 +01:00
Laurent Destailleur
58a57a0411
Merge branch 'develop' into fix-modoristomouv
2020-02-21 18:05:13 +01:00
Scrutinizer Auto-Fixer
e44865d8b5
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-21 16:53:37 +00:00
VESSILLER
71c9b94b22
NEW add const CASHDESK_FORCE_DECREASE_STOCK to force batch decrementation
2020-02-21 11:08:34 +01:00
Anthony Berton
bbb108133f
Update html.formproduct.class.php
2020-02-20 22:45:03 +01:00
Laurent Destailleur
1f4b639ba0
Debug MRP module
2020-02-20 17:44:03 +01:00
DEMAREST Maxime
4630525973
Fix: Mouvementstock::get_origin modulenme whith origintype
2020-02-20 16:19:28 +01:00
Laurent Destailleur
44eda2d4ad
Fix doxygen
2020-02-20 13:42:43 +01:00
Laurent Destailleur
f1d16d6961
Merge pull request #13138 from indelog/indelog-dev
...
NEW: Allow custom module class origine type in Mouvementstock
2020-02-19 00:53:04 +01:00
Laurent Destailleur
ce3e977fc3
Merge pull request #13141 from Dolibarr/scrutinizer-patch-5
...
Scrutinizer Auto-Fixes
2020-02-18 23:49:10 +01:00
Laurent Destailleur
9b522d105e
Merge pull request #13112 from josemariagomezroncero/patch-3
...
FIX Correction bug dynamic price
2020-02-18 23:48:53 +01:00
Scrutinizer Auto-Fixer
fd48877dc6
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-18 22:47:25 +00:00
Laurent Destailleur
2ac064059a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/projet/element.php
2020-02-18 22:40:43 +01:00
Laurent Destailleur
fa16063875
Fix bad accounting code set
2020-02-18 22:39:01 +01:00
Laurent Destailleur
31ae0bc06e
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/fourn/commande/index.php
htdocs/product/card.php
2020-02-18 22:38:30 +01:00
DEMAREST Maxime
30ef5f54dd
Allow custom module class origine type in Mouvementstock
2020-02-18 18:24:54 +01:00
Laurent Destailleur
a6b0fec90b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/exports/class/export.class.php
2020-02-17 12:35:34 +01:00
Laurent Destailleur
504a67daee
FIX duplicate class name into some log lines
2020-02-17 12:34:00 +01:00
Laurent Destailleur
549bf076d7
Fix prefix of log
2020-02-17 12:22:52 +01:00
gauthier
523d09536c
FIX : must be == and not =
2020-02-17 12:20:19 +01:00
Laurent Destailleur
f4f3efec62
Fight against $_POST
2020-02-16 19:33:58 +01:00
josemariagomezroncero
601cd3809c
Correction
2020-02-14 20:16:10 +01:00
josemariagomezroncero
27a874a6ba
Correction bug dynamic price
...
It
does not allow to continue when then the product hasnt supplier pirce
2020-02-14 11:38:51 +01:00
Laurent Destailleur
525219836a
Merge pull request #13097 from josemariagomezroncero/patch-2
...
Hook for dynamic price
2020-02-13 18:54:22 +01:00
josemariagomezroncero
0d49211dea
Correction for Hook for dynamic price
...
Correction for Hook for dynamic price
2020-02-13 12:59:59 +01:00
Laurent Destailleur
9e165a782f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-13 11:58:23 +01:00
Laurent Destailleur
78d4978d31
FIX #13100
2020-02-13 11:26:11 +01:00
Laurent Destailleur
a4f13194c3
Merge pull request #12503 from atm-greg/New_Supplier_Packaging
...
NEW Experiment supplier packaging with option PRODUCT_USE_SUPPLIER_PACKAGING: Using price according to the minimum quantity
2020-02-13 10:50:56 +01:00
Laurent Destailleur
0d366c45e5
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-12 21:43:44 +01:00
Laurent Destailleur
6be746e219
Fix replenishment for virtual stock check if module is on or off
2020-02-12 21:42:48 +01:00
josemariagomezroncero
373a5ff508
Hook for dynamic price
...
Hook for dynamic price
2020-02-12 21:31:45 +01:00
Laurent Destailleur
7931734ecb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modUser.class.php
2020-02-12 20:30:20 +01:00
Laurent Destailleur
83b5fe3c71
FIX #13077 Replace left join with inner join (left join was useless)
2020-02-12 20:24:58 +01:00
Laurent Destailleur
3f4c787c84
Fix physical stock were truncated in product/reassort page
2020-02-12 20:22:53 +01:00
ptibogxiv
558ccdd8b9
Update card.php
2020-02-11 20:20:34 +01:00
ptibogxiv
5459e4b821
Fix netmeasure update and display
...
nb: netmeasure is for real weight, volume or piece;
i'll try to introduce in v12 price by unit using this value ( needed for some business ie fruits, vegetables....)
2020-02-11 20:11:37 +01:00
Laurent Destailleur
d2bafe3052
Add tab with stock movements
2020-02-11 18:18:04 +01:00
Laurent Destailleur
74d3912763
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.facture.class.php
2020-02-11 16:52:58 +01:00
Laurent Destailleur
ee7aa14247
Fix color of status
2020-02-10 21:28:49 +01:00
Laurent Destailleur
cab228ebbe
Fix condition
2020-02-10 15:54:46 +01:00
Laurent Destailleur
bb40dbe1c3
Fix label of field
2020-02-10 15:53:28 +01:00
BENKE Charlene
40ac2d5cbd
Add finished field on list
2020-02-10 14:34:00 +01:00
Laurent Destailleur
2eae9a2fa2
FIX Missing include
2020-02-07 12:15:20 +01:00
Laurent Destailleur
c4204f95d4
FIX Missing include
2020-02-07 12:12:10 +01:00
stickler-ci
102595f6b1
Fixing style errors.
2020-02-06 09:02:15 +00:00
atm-greg
f8ffdea5ae
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_Supplier_Packaging
2020-02-06 09:59:42 +01:00
VESSILLER
c3cf9e62b3
FIX links in products/services index
2020-02-05 11:31:02 +01:00
Laurent Destailleur
ffa847bc8e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-02 19:32:37 +01:00
Laurent Destailleur
d530c7f708
Try fix for #12984
2020-01-31 18:57:07 +01:00
Scrutinizer Auto-Fixer
5fda829023
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-30 00:48:28 +00:00
Laurent Destailleur
80707d6a5e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-28 17:24:26 +01:00
Laurent Destailleur
3a9e238dc6
FIX Missing value of $formconfirm as parameters of hook
2020-01-28 12:00:27 +01:00
Laurent Destailleur
df478dc170
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-27 01:53:49 +01:00
Laurent Destailleur
be29795f7f
Merge pull request #12905 from laudeco/hotfix/qty_negative_stock
...
fix minimum quantity on stock movement
2020-01-26 22:09:43 +01:00
Laurent Destailleur
08d8670bb3
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/class/product.class.php
2020-01-24 20:12:27 +01:00
Laurent Destailleur
17f28189f9
Virtual stock must include Manufacturing Orders
2020-01-24 14:51:45 +01:00
Laurent Destailleur
540713510e
Fix load of segment prices not required for virtual stock change
...
virtual stock must include production (WIP)
2020-01-23 21:03:15 +01:00
Laurent Destailleur
12b4909c45
Fix load of segment prices not required for virtual stock change
...
virtual stock must include production (WIP)
2020-01-23 20:59:18 +01:00
Laurent Destailleur
27a0858050
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
2020-01-23 17:41:31 +01:00
Laurent Destailleur
646ccc1354
Fix error management
2020-01-23 11:52:00 +01:00
Laurent De Coninck
7ec17f17d5
FIX - API - DLC/DLUO date for stock movement
...
Instead of giving a string to the creation of a stock movement, we have
to give an integer.
This PR fixes that.
[see: X]
2020-01-23 09:41:22 +01:00
Laurent Destailleur
57569604b2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-22 14:11:53 +01:00
Laurent Destailleur
d3411a79ef
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-22 14:11:44 +01:00
Laurent Destailleur
4686be34d2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
htdocs/product/class/product.class.php
htdocs/stripe/charge.php
2020-01-22 14:10:46 +01:00
Laurent Destailleur
839f1b83fd
Merge pull request #12901 from OPEN-DSI/new-product-list-units-columns
...
NEW columns units in product list
2020-01-22 13:55:50 +01:00
Laurent De Coninck
73ee655dde
fix minimum quantity on stock movement
...
by fixing another issue on the batch management in the API, I introduced
a bug on the stock quantity decrease.
[see: X]
2020-01-22 08:13:00 +01:00
Laurent Destailleur
7e08dc17af
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-21 20:51:22 +01:00
Laurent Destailleur
fd02ed4317
Fix label
2020-01-21 20:50:58 +01:00
VESSILLER
c91ab621b8
FIX length, width and height coherence in product table
2020-01-21 17:49:27 +01:00
VESSILLER
8a348d533b
NEW only show units columns in product list (not in service list)
2020-01-21 17:29:45 +01:00
VESSILLER
70122411eb
FIX label Volume in comment
2020-01-21 11:02:14 +01:00
VESSILLER
0278cef2d7
NEW columns units in product list
2020-01-21 10:33:27 +01:00
Laurent Destailleur
92856788a3
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-20 18:39:46 +01:00
Laurent Destailleur
18f2b09fb1
Debug v11
2020-01-20 12:25:25 +01:00
Laurent Destailleur
969da828fa
Debug inventory
2020-01-20 02:30:53 +01:00
Laurent Destailleur
206cfcd7fe
Clean code for inventory
2020-01-20 02:07:47 +01:00
Laurent Destailleur
24d439845b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
2020-01-18 20:20:25 +01:00
Laurent Destailleur
45f322cce8
Fix error management in API
2020-01-18 20:17:21 +01:00
Laurent Destailleur
a1b03e094c
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-01-18 19:53:58 +01:00
Laurent Destailleur
df26bab65b
FIX #12881
2020-01-18 19:52:59 +01:00
Laurent De Coninck
d2e4b9346b
enhance the doc
2020-01-17 17:49:50 +01:00
Laurent De Coninck
5687d26f95
fixes the creation of a stock movement
...
This fixes the creation of a stock movement by supporting the DLC and
DLUO.
[see: #12883 ]
2020-01-17 17:21:14 +01:00
Laurent Destailleur
0ebed529e1
FIX #12872
2020-01-17 15:27:43 +01:00
Scrutinizer Auto-Fixer
2386573994
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-16 01:53:00 +00:00
VESSILLER
53ddbc1eb5
FIX remove repeated sql fields in product list
2020-01-15 16:24:04 +01:00
Laurent Destailleur
3f79c00542
Merge branch 'develop' into actioncomm_category
2020-01-15 14:21:06 +01:00
Laurent Destailleur
373420edc0
Merge pull request #12476 from ptibogxiv/patch-280
...
NEW add total of value in product stat
2020-01-15 14:11:01 +01:00
Laurent Destailleur
ad7da80353
Merge pull request #12479 from OPEN-DSI/new-product-list-units
...
NEW add units in product list
2020-01-15 14:09:50 +01:00
Laurent Destailleur
03a1897089
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/stocks.lang
2020-01-13 13:44:32 +01:00
Laurent Destailleur
2465d5ab47
Merge pull request #12837 from laudeco/hotfix/replenish_product
...
replenish product
2020-01-13 13:18:28 +01:00
Laurent Destailleur
bfa13e16ed
Debug MO module
2020-01-13 12:30:48 +01:00
Laurent De Coninck
67d73c5488
Fix the select of the provider for one product
2020-01-12 21:56:35 +01:00
Laurent Destailleur
b47db086cb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/inventory/class/inventory.class.php
htdocs/product/inventory/list.php
2020-01-10 14:30:42 +01:00
Laurent Destailleur
d97a59ac4a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
ChangeLog
htdocs/comm/remise.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/product/list.php
htdocs/variants/combinations.php
2020-01-10 14:25:26 +01:00
Laurent Destailleur
c4d62e0ea3
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/product/list.php
2020-01-10 13:51:29 +01:00
Laurent Destailleur
dd930fe791
Can disable a not expected behaviour on price propagation
2020-01-10 01:07:58 +01:00
Laurent Destailleur
78dcf91f02
Fix bad link
2020-01-09 22:42:31 +01:00
Laurent Destailleur
f48c7d2ecf
Fix modulebuilder
2020-01-09 22:31:23 +01:00
Laurent Destailleur
0e58edd896
Fix modulebuilder
2020-01-09 22:27:24 +01:00
Laurent Destailleur
124f41f863
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-09 09:10:11 +01:00
Laurent Destailleur
0802df78b5
Debug MRP
2020-01-08 17:56:02 +01:00
Laurent Destailleur
97f62c68f2
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-08 13:38:03 +01:00
Laurent Destailleur
5da952cf8a
Comment
2020-01-08 13:37:52 +01:00
Laurent Destailleur
622dc7e8d7
Debug v11
2020-01-07 22:01:55 +01:00
Laurent Destailleur
7ef3ee56bd
Fix MRP
2020-01-07 20:28:21 +01:00
Dev2a
2d67c2365f
Fix Check right for service for arrayofmassaction
...
if product module disable, threre is no action for service
2020-01-07 18:59:58 +01:00
Laurent Destailleur
0e496d2191
MRP
2020-01-06 02:55:09 +01:00
Laurent Destailleur
eca91af2ca
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-01-04 14:21:56 +01:00
Laurent Destailleur
7853427bb1
FIX product with empty stock were not visible
2020-01-04 14:21:38 +01:00
Laurent Destailleur
38de69f5a9
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/admin/dict.php
htdocs/comm/action/list.php
htdocs/compta/bank/releve.php
htdocs/compta/salaries/card.php
htdocs/core/actions_addupdatedelete.inc.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/boxes.lang
htdocs/langs/en_US/main.lang
htdocs/product/class/product.class.php
htdocs/product/reassort.php
htdocs/product/stock/product.php
htdocs/projet/element.php
2020-01-04 14:20:25 +01:00
Laurent Destailleur
0dafbd194f
Merge pull request #12750 from OPEN-DSI/v10-fix-product-virtual-stock-stats-sending
...
FIX add product qty in shipment already sent (fix for option STOCK_CALCULATE_ON_SHIPMENT_CLOSE)
2020-01-03 20:56:59 +01:00
Laurent Destailleur
37f9307732
Update product.class.php
2020-01-03 20:53:49 +01:00
VESSILLER
6e9bb5d7da
FIX sql bad request in product buying price extrafields
2020-01-03 20:49:54 +01:00
Pierre Ardoin
79458ac139
FIX an issue that shows all entities stock
...
Before : If products are shared between several entities, the stock of each entity are to add in this page (reassort.php)
Now : Each entity see only her stock and not other's stock.
2020-01-03 18:05:49 +01:00
Laurent Destailleur
2e8fd25299
FIX Local taxes was not correctly supported in TakePOS.
2020-01-01 21:54:47 +01:00
Laurent Destailleur
7d07c198bc
FIX Price of purchase order and vendor invoice with multicurrency
...
FIX entering predefined product with a forced unit price
2020-01-01 17:15:26 +01:00
Frédéric FRANCE
90235d0528
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-31 13:57:40 +01:00
Regis Houssin
71a2998118
FIX wrong var name and avoid warning
2019-12-30 15:36:09 +01:00
Regis Houssin
c76edb20d7
FIX avoid php warning
2019-12-27 12:20:38 +01:00
VESSILLER
b0edd46494
FIX add product qty in shipment already sent
2019-12-23 15:07:26 +01:00
Laurent Destailleur
9f86cd8824
Debug v11
2019-12-20 11:14:16 +01:00
Laurent Destailleur
03649ea2c8
Fix pb with svg images
2019-12-19 19:10:23 +01:00
Laurent Destailleur
f44b85f557
Fix $_SESSION['newtoken'] must be newToken()
2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer
455178ff73
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-18 14:20:36 +00:00
Laurent Destailleur
f4b7e038f8
Merge pull request #12714 from frederic34/patch-6
...
doxygen
2019-12-16 19:03:47 +01:00
Laurent Destailleur
1af67a4336
Merge pull request #12713 from frederic34/doxygen_warning
...
doxygen
2019-12-16 19:02:10 +01:00
Scrutinizer Auto-Fixer
c8baaa2995
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-16 12:06:25 +00:00
Frédéric FRANCE
e1386faa59
doxygen
2019-12-15 10:53:03 +01:00
Frédéric FRANCE
9e4fb8d4fe
doxygen
2019-12-15 10:02:20 +01:00
Laurent Destailleur
838633d0de
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/api/class/api_setup.class.php
htdocs/compta/facture/card.php
htdocs/compta/stats/index.php
htdocs/core/actions_massactions.inc.php
htdocs/install/upgrade2.php
htdocs/loan/card.php
htdocs/loan/document.php
htdocs/loan/info.php
htdocs/loan/note.php
htdocs/loan/schedule.php
htdocs/product/list.php
htdocs/ticket/card.php
htdocs/user/class/user.class.php
2019-12-14 14:53:49 +01:00
Laurent Destailleur
835d22f556
Merge branch 'develop' into doxygen_todo
2019-12-14 13:46:40 +01:00
Laurent Destailleur
dea5396029
Merge pull request #12705 from frederic34/patch-21
...
doxygen
2019-12-14 13:42:46 +01:00
Laurent Destailleur
65bf2fa285
Merge pull request #12689 from code-chicken/develop
...
Fix: calculation of virtual stock
2019-12-14 13:40:02 +01:00
Frédéric FRANCE
57055bad03
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-13 14:36:00 +01:00
Frédéric FRANCE
c269229aab
doxygen
2019-12-13 08:12:55 +01:00
Laurent Destailleur
ce47de453e
Fix HTML5
2019-12-12 10:31:08 +01:00
Frédéric FRANCE
9357bfd98e
doxygen
2019-12-12 08:17:14 +01:00
Laurent Destailleur
63b9656468
Fix use of currency accuracy
2019-12-11 17:05:42 +01:00
Rüdiger Hahn
cc96ad03c1
Update replenish.php
2019-12-11 14:00:27 +01:00
Laurent Destailleur
24e9d3fdf0
Merge pull request #12631 from atm-florianm/FIX_10.0_backporting_duration_fix_from_develop
...
FIX 10.0: do not display single-letter duration values in product list
2019-12-09 17:43:32 +01:00
Scrutinizer Auto-Fixer
4debd71281
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-06 08:26:49 +00:00
Frédéric FRANCE
d9bfa62367
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-05 21:47:42 +01:00
Florian Mortgat
3f6715a377
FIX: add URL param "restore_last_search_values=1" to all backlinks that point to a list
2019-12-05 15:34:41 +01:00
Florian Mortgat
139419c3e8
FIX 10.0: do not display single-letter values (indicating duration unit without value) in product list
...
(this fix exists in develop)
2019-12-05 10:38:03 +01:00
Laurent Destailleur
b78f310508
Reponsive
2019-12-04 15:49:22 +01:00
Laurent Destailleur
bde917d7fc
Fix responsive
2019-12-04 15:09:20 +01:00
Frédéric FRANCE
4c5c6b6ff1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-03 17:56:43 +01:00
Frédéric FRANCE
650c9c2e57
Update product.class.php
2019-12-03 16:46:50 +01:00
Frédéric FRANCE
85d8d2ff58
select_product_fourn_price returns void
2019-12-03 15:19:58 +01:00
Laurent Destailleur
41a176ce72
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/remx.php
htdocs/core/modules/modStripe.class.php
htdocs/product/stock/replenish.php
htdocs/stripe/payout.php
2019-12-03 13:58:15 +01:00
Laurent Destailleur
eb5a2bd1a5
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/expensereport/card.php
htdocs/user/card.php
2019-12-03 13:52:42 +01:00
Laurent Destailleur
a00d011f10
Merge pull request #12609 from frederic34/patch-20
...
Update product.class.php
2019-12-03 13:18:29 +01:00
Laurent Destailleur
37cee5840a
Merge pull request #12608 from frederic34/patch-19
...
$id parameter was removed long time ago
2019-12-03 13:17:01 +01:00
Scrutinizer Auto-Fixer
36a74cd160
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-03 10:17:29 +00:00
Frédéric FRANCE
ac674aae6a
Update product.class.php
2019-12-02 20:45:28 +01:00
Frédéric FRANCE
579f570abf
$id parameter was removed long time ago
2019-12-02 20:42:48 +01:00
Laurent Destailleur
92070fa491
Fix name of variable $trigger_name into $triggersendname
2019-12-02 09:38:16 +01:00
Frédéric FRANCE
25ed2b930f
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-01 16:10:37 +01:00
Cédric
7b295bf738
addPurchasePrice Update the price if already exist
2019-12-01 14:56:39 +01:00
Maxime Kohlhaas
270f4c2500
Fix #12044 : with replenish function, use product supplier desc in order
2019-12-01 09:26:54 +01:00
Laurent Destailleur
f549c4fc9c
Merge pull request #12544 from frederic34/select_produits
...
Form select_produits returns void
2019-12-01 00:47:02 +01:00
Laurent Destailleur
d338a054eb
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
2019-12-01 00:41:23 +01:00
Laurent Destailleur
a2a96f8796
# WARNING: head commit changed in the meantime
...
Restore file for travis
2019-12-01 00:41:11 +01:00
Laurent Destailleur
3c328153bb
Merge pull request #12581 from homer8173/patch-12
...
add location on combobox
2019-12-01 00:32:23 +01:00
Norbert Penel
89f57d7d3b
add label to combobox
...
useful for BOM, etc
2019-11-30 23:45:24 +01:00
Norbert Penel
755417e9a9
add location on combobox
...
usefull for BOM, etc
2019-11-30 23:43:22 +01:00
stickler-ci
1bad6f5c9c
Fixing style errors.
2019-11-30 22:38:05 +00:00
Cédric
565a17dc47
API New add purchase prices
2019-11-30 23:36:23 +01:00
Norbert Penel
e3fb27e3fc
Default type missing for add links from module builder
...
BOM links to add product don't precise the type (from common object)
2019-11-30 19:34:22 +01:00
Laurent Destailleur
3b9d2abcb2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/product.lib.php
htdocs/filefunc.inc.php
htdocs/product/class/product.class.php
htdocs/product/list.php
2019-11-29 11:42:08 +01:00
Laurent Destailleur
a4a805f618
Doxygen
2019-11-29 11:32:22 +01:00
Laurent Destailleur
3acd0bc2ff
FIX Reduce number of request for list of products
2019-11-29 11:32:09 +01:00
Frédéric FRANCE
c214dd0675
Form select_produits returns void
2019-11-28 21:23:53 +01:00
Laurent Destailleur
d58bb5f66b
Fix link to user
2019-11-28 16:16:55 +01:00
Laurent Destailleur
6ee6c5d514
Fix edit of product images
2019-11-28 14:09:41 +01:00
stickler-ci
76c5a08242
Fixing style errors.
2019-11-28 12:13:36 +00:00
Cédric
45bf3e4df9
Merge branch 'develop' into patch-3
2019-11-28 13:11:52 +01:00
Scrutinizer Auto-Fixer
5f99e25c45
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-28 11:36:20 +00:00
Frédéric FRANCE
b2912e688b
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-27 22:54:05 +01:00
Frédéric FRANCE
6ea204bd73
Update entrepot.class.php
2019-11-26 20:20:46 +01:00
Frédéric FRANCE
28b70a5399
remove deprecated
2019-11-26 20:14:46 +01:00
Laurent Destailleur
30ea48a715
Fix api for deletion of attributes
2019-11-26 12:58:41 +01:00
Frédéric FRANCE
4c4ae5b6e1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-26 08:10:40 +01:00
VESSILLER
35f02c5165
NEW add width and height measures in product list
2019-11-25 10:25:09 +01:00
stickler-ci
5d051cc901
Fixing style errors.
2019-11-25 07:08:22 +00:00
Cédric
6484ba10c5
remove unecessary code
...
already done by ::createProductCombination
2019-11-23 16:08:35 +01:00
atm-greg
ce15af0980
manage packaging on supplier prices
2019-11-23 15:52:34 +01:00
Cédric
76fd794559
API New can customize reference when addvariant
2019-11-23 14:04:00 +01:00
ptibogxiv
4d9894e58e
Update card.php
2019-11-22 15:49:06 +01:00
Laurent Destailleur
24bb345ee1
Fix bad name of function
2019-11-22 15:35:19 +01:00
Laurent Destailleur
7cf71f7283
Merge pull request #12477 from code-chicken/develop
...
Use virtual stock when it has been configured
2019-11-22 14:47:32 +01:00
Laurent Destailleur
3242835111
Update replenish.php
2019-11-22 14:47:15 +01:00
Laurent Destailleur
2fc00437d8
Merge pull request #12493 from Dolibarr/scrutinizer-patch-12
...
Scrutinizer Auto-Fixes
2019-11-22 14:35:49 +01:00
Laurent Destailleur
f0e7eaf0cd
Merge pull request #12453 from c3do/patch-3
...
API New get / add / remove subproducts, attributes and variants
2019-11-22 14:34:54 +01:00
Scrutinizer Auto-Fixer
b388c6b7a8
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-22 13:14:59 +00:00
Cédric
e76a112099
Remove unecessary dol_clone in ::putVariant
2019-11-21 23:09:18 +01:00
stickler-ci
821ca724a5
Fixing style errors.
2019-11-21 21:54:51 +00:00
Cédric
1bc8c57d6d
Fix $weight_impact $price_impact
2019-11-21 22:54:13 +01:00
Cédric
5a3f78088e
Fix double deleteAttributeValueByRef
2019-11-21 18:18:11 +01:00
Cédric
351ba58bbe
Fix Superfluous parameter comment
2019-11-21 17:43:40 +01:00
stickler-ci
cfa0860d24
Fixing style errors.
2019-11-21 16:41:45 +00:00
Cédric
416a2f7f1c
FIX putAttributes, ADD putAttributeValue
2019-11-21 17:41:09 +01:00
stickler-ci
0074589b6f
Fixing style errors.
2019-11-21 16:24:25 +00:00
Cédric
1068d9a623
FIX deleteAttributeValueByRef / ADD getAttributeValueById, getAttributeValueByRef
2019-11-21 17:23:46 +01:00
stickler-ci
4f747e2eb8
Fixing style errors.
2019-11-21 14:50:47 +00:00
Cédric
d6ba06e271
API New get attribute by ref + security update
2019-11-21 15:50:06 +01:00
Laurent Destailleur
0fffdd891e
Sanitize data
2019-11-21 15:37:59 +01:00
VESSILLER
b7517377a7
FIX goup by unit label in product list
2019-11-20 15:00:34 +01:00
VESSILLER
38b083b766
FIX unit translate in product list if null
2019-11-20 14:43:29 +01:00
VESSILLER
0a125f73b5
NEW add units in product list
2019-11-20 14:21:35 +01:00
Rüdiger Hahn
9018ec7eb2
Merge branch 'develop' into develop
2019-11-20 13:09:51 +01:00
Rüdiger Hahn
db0d352af3
Use virtual stock when this has been configured
...
When "Use virtual stock by default, instead of physical stock, for replenishment feature" has been set in configuration, this should really be used. Otherwise only physically missing items will be shown in replenishment.
2019-11-20 12:53:23 +01:00
ptibogxiv
f1a9daf77e
NEW add total of value in product stat
2019-11-20 12:42:56 +01:00
stickler-ci
c33506b4cc
Fixing style errors.
2019-11-19 13:41:30 +00:00
Cédric
8fbf853b94
Display attributes infos when get product variants
2019-11-19 14:40:50 +01:00
Frédéric FRANCE
2e5f539b2a
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-18 17:45:52 +01:00
Laurent Destailleur
3300446cbf
Fix td colspan
2019-11-18 14:13:51 +01:00
stickler-ci
a17e183da9
Fixing style errors.
2019-11-17 00:18:43 +00:00
Cédric
8c057f1975
API New Product variants
2019-11-17 01:20:15 +01:00
Laurent Destailleur
e15963688a
Merge pull request #12435 from OPEN-DSI/fix-product-virtual-stock-stats-sending
...
FIX add product qty in shipment already sent only if reel stock was d…
2019-11-16 23:34:44 +01:00
Laurent Destailleur
2689f7515c
Fix pb with colspan and extrafields.
...
Fix remove empty id
2019-11-16 14:38:05 +01:00
Cédric
256e256f62
Paths and vars: subproducts instead of childs
2019-11-16 12:30:47 +01:00
Cédric
33d4c4b73c
Doc for $child_id
2019-11-16 11:23:50 +01:00
Cédric
04f58f5d32
$includesubproducts and path consistency
2019-11-16 11:17:56 +01:00
Frédéric FRANCE
6784ea9fae
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-16 09:21:57 +01:00
stickler-ci
aa7353d3cf
Fixing style errors.
2019-11-15 21:18:40 +00:00
Cédric
f620b165d3
API New get / add / remove product childs
2019-11-15 22:17:53 +01:00
Laurent Destailleur
1f5bea01f5
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/product/fournisseurs.php
htdocs/user/card.php
2019-11-14 21:30:16 +01:00
Laurent Destailleur
7e52c70321
FIX Advisory ID: usd20190067
2019-11-14 21:16:18 +01:00
Laurent Destailleur
da3a907075
Merge branch 'develop' into fix-product-virtual-stock-stats-sending
2019-11-14 12:16:28 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-14 11:09:15 +00:00
VESSILLER
851cf4f3f3
FIX add product qty in shipment already sent only if reel stock was decremented
2019-11-14 09:52:13 +01:00
Frédéric FRANCE
a3e092b227
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-14 09:21:26 +01:00
Laurent Destailleur
171b94fc5c
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5
...
Scrutinizer Auto-Fixes
2019-11-14 08:50:24 +01:00
Laurent Destailleur
614faa07c1
Merge pull request #12427 from Dolibarr/scrutinizer-patch-3
...
Scrutinizer Auto-Fixes
2019-11-14 08:49:53 +01:00
Frédéric FRANCE
446c66da62
use class CONST
2019-11-14 08:15:39 +01:00
Scrutinizer Auto-Fixer
b40ecc3933
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer
ac40dd8bbe
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer
f4aaa8d9bb
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:34:37 +00:00
Scrutinizer Auto-Fixer
87585c0f2a
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 17:32:11 +00:00
Scrutinizer Auto-Fixer
c85e54b08c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-12 08:46:08 +00:00
Scrutinizer Auto-Fixer
df664e790b
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-11 23:15:34 +00:00
Laurent Destailleur
8976bd7c9b
Fix setup of accounting account
2019-11-11 19:05:42 +01:00
stickler-ci
3df87a419c
Fixing style errors.
2019-11-10 11:12:42 +00:00
Philippe GRAND
098ffd4827
add some comment
2019-11-10 12:12:14 +01:00
Philippe GRAND
69e1d0480a
add some comment
2019-11-10 12:10:13 +01:00
Laurent Destailleur
274ddaa1be
Fix mandatory field
2019-11-09 19:01:03 +01:00
Cédric
4dbf151b15
Inject $user in ProductCombination::updateProperties
2019-11-09 13:29:12 +01:00
Scrutinizer Auto-Fixer
2ecfe41810
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-08 09:53:31 +00:00
Laurent Destailleur
f11943126a
Fix scrutinizer
2019-11-08 09:42:39 +01:00
Laurent Destailleur
3fcc72f504
Merge pull request #12353 from frederic34/patch-17
...
can't have static and $this at same time
2019-11-07 11:32:55 +01:00
Laurent Destailleur
9dc309d59d
Merge pull request #12351 from frederic34/patch-15
...
Update fournisseurs.php
2019-11-07 11:31:43 +01:00
Laurent Destailleur
1ea8fed9c4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-11-07 11:16:20 +01:00
Laurent Destailleur
feef992d39
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-11-07 11:16:09 +01:00
Frédéric FRANCE
90f80d137f
can't have static and $this at same time
2019-11-05 23:19:11 +01:00
Frédéric FRANCE
d1131e6b5a
Update fournisseurs.php
2019-11-05 22:27:30 +01:00
Frédéric FRANCE
35751a80ab
100% centpercent
2019-11-05 21:24:41 +01:00
Laurent Destailleur
d972fa8bcb
Fix pb with model_pdf
2019-11-05 20:20:57 +01:00
Laurent Destailleur
94bd0f71d9
Fix pb with permission
2019-11-05 19:41:30 +01:00
Laurent Destailleur
ce1dec253f
FIX #11364
2019-11-05 12:47:38 +01:00
Laurent Destailleur
0347d82660
Merge pull request #12303 from frederic34/patch-2
...
css
2019-11-04 20:31:02 +01:00
Laurent Destailleur
5d41268d1e
CSS
2019-11-04 19:28:04 +01:00
Laurent Destailleur
11500fb8d9
FIX confusion between permto... and permisstionto...
2019-11-04 15:33:49 +01:00
Frédéric FRANCE
534f8712a3
Update fournisseurs.php
2019-11-02 18:11:18 +01:00
Frédéric FRANCE
4a564cc05d
Update product.class.php
2019-11-02 18:10:01 +01:00
Laurent Destailleur
6f82c212a0
Finished migration to the new architecture of extrafields
2019-11-02 17:38:19 +01:00
Laurent Destailleur
496f93911f
Merge pull request #11821 from Tim-Otte/develop
...
NEW Extrafields support in product supplier prices
2019-11-02 16:19:13 +01:00
Laurent Destailleur
8485747713
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-11-02 13:37:43 +01:00
Laurent Destailleur
9e69b12847
FIX #12281
2019-11-02 13:37:30 +01:00
Laurent Destailleur
e087ac434d
Merge pull request #12283 from frederic34/socid
...
replace deprecated user->societe_id by user->socid
2019-11-02 13:34:21 +01:00
Laurent Destailleur
80fd5af32b
Merge pull request #12271 from frederic34/patch-3
...
css
2019-11-02 13:30:38 +01:00
Laurent Destailleur
7fae6d60a7
Merge pull request #12270 from frederic34/patch-2
...
css
2019-11-02 13:09:38 +01:00
Laurent Destailleur
d232b7a387
Merge pull request #12286 from grandoc/new_branch_01_11_2019
...
add some comment
2019-11-02 13:00:23 +01:00
Laurent Destailleur
58ffb73627
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-11-02 12:59:49 +01:00
Laurent Destailleur
45c77b4560
Renaming some libelle into label
2019-11-02 12:59:38 +01:00
Laurent Destailleur
25e64b0610
Merge branch 'develop' into socid
2019-11-02 12:01:06 +01:00
Laurent Destailleur
c12e66e2a2
Merge branch 'develop' into new_branch_01_11_2019
2019-11-02 12:00:04 +01:00
Laurent Destailleur
68691ddd8a
Merge pull request #12265 from grandoc/new_branch_30_10_2019
...
add comment
2019-11-02 11:49:28 +01:00
Laurent Destailleur
41a3861465
Merge pull request #12290 from ptibogxiv/patch-273
...
FIX prices by customer API
2019-11-02 11:47:32 +01:00
Frédéric FRANCE
77d4ca81dc
Merge remote-tracking branch 'upstream/develop' into socid
2019-11-02 09:14:15 +01:00
Laurent Destailleur
cea2c3a9f4
Look and feel v11
2019-11-01 23:58:14 +01:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid
2019-11-01 21:39:20 +01:00
stickler-ci
0e260c859b
Fixing style errors.
2019-11-01 19:28:39 +00:00
ptibogxiv
6f77885686
Update api_products.class.php
2019-11-01 20:26:39 +01:00
stickler-ci
bc5e6c867f
Fixing style errors.
2019-11-01 14:37:21 +00:00
ptibogxiv
0f80ba5353
FIX prices by customer API
2019-11-01 15:36:48 +01:00
Laurent Destailleur
e3b5be7475
All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed
...
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
2019-11-01 12:52:03 +01:00
Philippe GRAND
07cd656a1c
add some comment
2019-11-01 10:56:46 +01:00
Laurent Destailleur
68a4ddceed
Look and feel v11
2019-10-31 23:29:17 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid
2019-10-31 20:46:31 +01:00
atm-josselin
5550a62afa
Fix misspelling on field of productlot
2019-10-31 11:05:45 +01:00
Frédéric FRANCE
3738fb87ed
css
2019-10-30 18:42:33 +01:00
Frédéric FRANCE
bfe683d031
css
2019-10-30 18:40:07 +01:00
Philippe GRAND
b029febff1
add some comment
2019-10-30 10:07:54 +01:00
Laurent Destailleur
19f97fb23b
Merge pull request #12211 from frederic34/patch-2
...
doxygen product.class.php
2019-10-30 03:16:22 +01:00
Laurent Destailleur
4eedf4a113
Merge branch '10.0' of https://github.com/dolibarr/dolibarr into develop
2019-10-29 11:48:36 +01:00
Laurent Destailleur
9483e367ca
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0
...
Conflicts:
htdocs/expensereport/class/expensereport.class.php
htdocs/product/stock/replenishorders.php
2019-10-29 11:48:11 +01:00
Laurent Destailleur
149d63757f
Space
2019-10-29 11:43:56 +01:00
Laurent Destailleur
e58ecaaa64
Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
...
Conflicts:
htdocs/product/stock/replenishorders.php
2019-10-29 11:43:35 +01:00
Laurent Destailleur
2814a5c07b
Fix phpcs
2019-10-24 21:47:31 +02:00
Laurent Destailleur
8d21144521
Beautify select of products in vendor record
2019-10-24 20:33:16 +02:00
Laurent Destailleur
443ca85f43
NEW Beautify the select of warehouses
2019-10-24 19:48:25 +02:00
Laurent Destailleur
31452dad42
NEW Beautify the select of warehouses
2019-10-24 19:34:28 +02:00
Laurent Destailleur
6855f588b5
Use dolGetStatus
2019-10-24 16:38:06 +02:00
Frédéric FRANCE
5999d8a05a
Update product.class.php
2019-10-24 16:11:05 +02:00
Frédéric FRANCE
93a8b1d2a3
Update product.class.php
2019-10-24 16:09:35 +02:00
Laurent Destailleur
1ea3865f0d
Look and feel v11
2019-10-24 13:01:03 +02:00
Juanjo Menent
7e9d6dc153
Fix With pagination it is possible that the searched product does not appear if there are many open supplier orders
2019-10-24 10:58:29 +02:00
Laurent Destailleur
da00591bba
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/product.lib.php
htdocs/expedition/card.php
htdocs/product/list.php
2019-10-23 04:04:32 +02:00
Laurent Destailleur
2e573fd794
Fix save of units
...
Conflicts:
htdocs/expedition/card.php
htdocs/product/card.php
htdocs/product/class/product.class.php
2019-10-23 03:03:55 +02:00
Laurent Destailleur
f0355b3057
Debug option PRODUCT_ADD_NET_MEASURE
2019-10-23 02:58:39 +02:00
Laurent Destailleur
2f0b791cfe
Merge pull request #12202 from atm-gauthier/10.0_fix_search_on_product_and_service
...
FIX : if we search something with global search, and after with form …
2019-10-22 20:06:10 +02:00
Laurent Destailleur
c4be61c55c
FIX Better compatible fix for the trouble of weight / size units
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/product/card.php
2019-10-22 18:42:59 +02:00
Laurent Destailleur
e7e9898e0d
FIX Better compatible fix for the trouble of weight / size units
2019-10-22 18:36:36 +02:00
Laurent Destailleur
b88968520b
Move code of extrafields to the new architecture
2019-10-22 17:08:37 +02:00
gauthier
44ced0cbeb
FIX : if we search something with global search, and after with form fields, we want to stay on Products AND Services list
2019-10-22 16:11:59 +02:00
Laurent Destailleur
6079a4d159
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/langs/en_US/main.lang
2019-10-22 15:25:31 +02:00
Laurent Destailleur
5ad7ca5620
Code more generic around setting projet on a card
2019-10-22 13:43:24 +02:00
Tim Otte
ceb3482204
Requested changes implemented
2019-10-22 11:36:28 +02:00
Laurent Destailleur
e261d63295
NEW Can add a button "Create" after combo of object with modulebuilder.
2019-10-21 14:44:39 +02:00
Laurent Destailleur
48f5970c7a
Debug net measure
2019-10-21 14:43:39 +02:00
Frédéric FRANCE
86f22c4563
do not ignore lines with mix od tabs and spaces
2019-10-20 17:17:22 +02:00
Laurent Destailleur
49c101bb77
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-10-20 15:16:51 +02:00
Laurent Destailleur
d79114c1f8
Clean code
2019-10-20 15:16:40 +02:00
Laurent Destailleur
05fed5358a
Merge pull request #12179 from c3do/develop
...
NEW Add API to get objects by ref, ref_ext, ...
2019-10-20 13:42:18 +02:00
Laurent Destailleur
24dc7fb667
Merge pull request #12173 from OPEN-DSI/new-product-clone-customer-prices
...
NEW add clone customers prices in clone product or service
2019-10-20 13:27:50 +02:00
Frédéric FRANCE
7581275316
wip
2019-10-20 11:59:21 +02:00
c3do
ae3ce37a57
copyright mentions
2019-10-19 16:45:30 +02:00
c3do
6742700c04
Can get product by ref, ref_ext, barcode through API Rest
2019-10-19 16:36:11 +02:00
VESSILLER
801092d848
NEW add clone customers prices in clone product or service
2019-10-18 15:10:22 +02:00
Laurent Destailleur
ce1b443212
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-10-18 14:26:09 +02:00
Laurent Destailleur
4d9c285126
Merge pull request #12163 from sadlig/fix-stock-movement-right
...
Fix Stock movement user's right (Fixes #11967 )
2019-10-17 17:53:17 +02:00
Gildas
132ea56a59
Fix Stock movement user's right ( Fixes #11967 )
2019-10-17 17:06:38 +02:00
Marc de Lima Lucio
d79340a632
FIX: stock replenish: fetching and freeing non existing SQL result set
2019-10-17 09:55:02 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
2019-10-16 20:00:01 +02:00
Laurent Destailleur
c69e934f9c
Merge pull request #12135 from c3do/patch-1
...
NEW Can update product type with update method
2019-10-16 14:28:21 +02:00
Laurent Destailleur
4ca9fddfcc
Update product.class.php
2019-10-16 14:26:49 +02:00
Laurent Destailleur
b60ddc255c
Removed useless html tags
2019-10-16 14:17:53 +02:00
Laurent Destailleur
e07e01580d
Replace deprecated code with new one
2019-10-16 03:34:32 +02:00
Laurent Destailleur
fc90916de9
Look and feel v11
2019-10-16 03:17:53 +02:00
Laurent Destailleur
fb3d20107c
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/exports/export.php
htdocs/filefunc.inc.php
2019-10-15 03:51:57 +02:00
Cédric
3429cb7c1d
New: Update product type with update method
2019-10-14 22:42:38 +02:00
Cédric
2257706a30
New: Update product type with update method
2019-10-14 22:22:20 +02:00
Laurent Destailleur
0d21e61673
Merge pull request #12116 from frederic34/patch-18
...
fix travis
2019-10-14 20:53:42 +02:00
atm-josselin
4f10009113
Add fields definition in product batch class for extrafields compatibility
2019-10-14 15:39:38 +02:00
Laurent Destailleur
0cd451ef1a
Fix show duration in list of services
2019-10-14 15:06:21 +02:00
Laurent Destailleur
9922ff39ca
Fix show duration in list of services
2019-10-14 15:01:37 +02:00
Frédéric FRANCE
4e52276d1f
fix travis
2019-10-14 13:14:02 +02:00
Laurent Destailleur
67d76787eb
Add new hidden conf VARIANT_ALLOW_STOCK_MOVEMENT_ON_VARIANT_PARENT
2019-10-12 15:29:06 +02:00
Laurent Destailleur
9871dd8770
Debug variants
2019-10-12 15:27:06 +02:00
Laurent Destailleur
9ba992b8b6
Work on inventory module
2019-10-12 12:31:35 +02:00
Laurent Destailleur
dccfdad9dd
Work on inventory feature
2019-10-12 11:32:47 +02:00
ptibogxiv
2b9be13a7c
Update card.php
2019-10-09 15:26:55 +02:00
Laurent Destailleur
29384d9a71
Merge branch 'develop' into patch-187
2019-10-09 13:02:47 +02:00
ptibogxiv
10c29887d6
Update product.class.php
2019-10-08 16:15:12 +02:00
ptibogxiv
e2d76f6f24
Update product.class.php
2019-10-08 16:13:59 +02:00
Laurent Destailleur
653958b1a2
Merge pull request #11094 from altatof/prodstats
...
NEW Extend option ORDER_ADD_ORDERS_WITH_PARENT_PROD_IF_INCDEC for all virtual product stats (renamed into PRODUCT_STATS_WITH_PARENT_PROD_IF_INCDEC)
2019-10-08 15:12:52 +02:00
Laurent Destailleur
71c18b7d65
Merge pull request #12062 from frederic34/patch-13
...
remove stock data from getsupplierprice
2019-10-08 14:50:41 +02:00
Laurent Destailleur
43a70e5548
Clean code to use the new $extrafields->attributes array
2019-10-08 09:28:50 +02:00
Frédéric FRANCE
41cdf0d5a0
remove stock data from getsupplierprice
...
stock data can be retrieved with get
2019-10-08 08:19:27 +02:00
Laurent Destailleur
80cbc09f21
Merge pull request #12046 from frederic34/apisupplierproduct
...
api supplier price delete
2019-10-07 10:22:48 +02:00
Laurent Destailleur
866dcf18fe
Look and feel v11
2019-10-06 15:34:22 +02:00
Laurent Destailleur
2b66282b61
NEW Code for extrafields uses the new array $extrafields->attributes
2019-10-06 14:41:52 +02:00
Frédéric FRANCE
b895f8a78f
api supplier get purchase prices
2019-10-05 21:19:55 +02:00
Frédéric FRANCE
10671e3266
api supplier price delete
2019-10-05 21:15:13 +02:00
Laurent Destailleur
b883a8092a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/product.lib.php
htdocs/core/tpl/extrafields_list_search_input.tpl.php
htdocs/fourn/facture/card.php
htdocs/product/class/html.formproduct.class.php
2019-10-05 19:35:40 +02:00
altairis
85bbf1decb
Merge branch 'develop' into prodstats
2019-10-04 11:05:36 +02:00
Laurent Destailleur
1a66e0b05e
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/product/card.php
2019-10-03 17:53:59 +02:00
Laurent Destailleur
75be637b0b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-10-03 17:50:57 +02:00
Frédéric FRANCE
c5f729b945
Update list.php
2019-10-02 22:59:13 +02:00
Laurent Destailleur
d8a8c4fbe6
Look and feel v11. Picto are fontawesome.
2019-10-02 18:36:36 +02:00
Laurent Destailleur
24570f7165
Look and feel v11. Picto are fontawesome.
2019-10-02 18:14:41 +02:00
Laurent Destailleur
4928a999a0
Merge pull request #11933 from atm-gauthier/fix_conf_to_allow_changeproducttype
...
FIX : change product type must be allowed if we activate hidden conf
2019-10-01 14:41:52 +02:00
Laurent Destailleur
d448998762
Update card.php
2019-10-01 14:41:25 +02:00
gauthier
2167e7ed98
FIX : hidden conf to prevent from changing product_type
2019-10-01 09:12:51 +02:00
Alexandre SPANGARO
16c6c9ae75
Merge remote-tracking branch 'upstream/develop' into 11.0_https
2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd
Merge branch 'develop' into 11.0_https
2019-10-01 06:11:43 +02:00
Laurent Destailleur
d9e9364ddf
Close #11689 Close #11696
2019-09-30 19:00:19 +02:00
Laurent Destailleur
b28cd1bb57
Merge pull request #11972 from aspangaro/11.0_fa_icon
...
NEW Add fa_icon on load_fiche_titre
2019-09-30 15:26:28 +02:00
Alexandre SPANGARO
aec50d3ac9
NEW Add fa_icon on load_fiche_titre
2019-09-30 10:14:55 +02:00
Laurent Destailleur
6966651d51
Standardize code to use dolSqlDateFilter
2019-09-28 13:22:05 +02:00
Alexandre SPANGARO
288aea190b
Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon
2019-09-28 06:09:40 +02:00
Alexandre SPANGARO
7f93f046e9
NEW Add fa_icon on load_fiche_titre
2019-09-28 06:02:25 +02:00
Laurent Destailleur
d0d884742f
FIX #11861 Not consistent code to manage measuring units
2019-09-27 19:45:33 +02:00
Laurent Destailleur
ea62ea8c70
Merge pull request #11901 from ptibogxiv/patch-263
...
NEW: delete purchase price API
2019-09-27 15:37:21 +02:00
VESSILLER
5f08a649eb
FIX empty cache when we want to load specific warehouses in select
...
Conflicts:
htdocs/product/class/html.formproduct.class.php
2019-09-27 15:10:05 +02:00
Laurent Destailleur
8ef227f24a
Merge pull request #11902 from OPEN-DSI/fix-formproduct-select-warehouses-cache
...
FIX empty cache when we want to load specific warehouses in select
2019-09-27 14:59:14 +02:00
Laurent Destailleur
acfceecda5
Merge pull request #11925 from OPEN-DSI/new-product-fournisseurs-units
...
NEW add units fields in buying price tab of product card
2019-09-27 14:17:52 +02:00
Laurent Destailleur
6858dce344
Rename table for categorie of warehouses
2019-09-27 13:28:28 +02:00
Laurent Destailleur
a79c4608d6
Merge pull request #11934 from atm-quentin/NEW_stock_categories
...
NEW Categories/Tags are also available on warehouses
2019-09-27 12:41:28 +02:00
Laurent Destailleur
41101d3dbe
Merge pull request #11955 from bafbes/abb100078
...
fix:forgotten test condition
2019-09-27 11:30:03 +02:00
Laurent Destailleur
961f2b5165
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/categories/viewcat.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/takepos/invoice.php
2019-09-24 14:25:02 +02:00
Laurent Destailleur
6431e8e16d
FIX SQL injection on qty
2019-09-24 12:43:44 +02:00
Abbes Bahfir
1ca531239e
fix:forgotten test condition
2019-09-24 09:40:19 +01:00
Frédéric FRANCE
26cd418320
Update price_parser.class.php
2019-09-24 10:28:27 +02:00
Alexandre SPANGARO
02dbc11f98
Move Gnu.org to https
2019-09-23 21:55:30 +02:00
atm-quentin
a46ed62e81
Merge branch 'NEW_stock_categories' of github.com:atm-quentin/dolibarr into NEW_stock_categories
2019-09-19 16:43:49 +02:00
atm-quentin
769ef78d8e
FIX missing comment
2019-09-19 16:43:21 +02:00
stickler-ci
774ec5a274
Fixing style errors.
2019-09-19 14:30:23 +00:00
atm-quentin
c09f2d8c4e
NEW stock categories
2019-09-19 16:21:03 +02:00
gauthier
d40534e8fa
FIX : change product type must be allowed if we activate hidden conf
2019-09-19 15:21:52 +02:00
VESSILLER
ca18448b48
NEW add units fields in buying price tab of product card
2019-09-18 10:36:13 +02:00
VESSILLER
6e806a5aed
FIX empty cache when we want to load specific warehouses in select
2019-09-16 10:37:55 +02:00
ptibogxiv
ea1baefe9a
NEW: delete purchase price API
2019-09-15 20:50:18 +02:00
Laurent Destailleur
12d67c5f85
Rename api to get all purchase prices
2019-09-15 17:18:10 +02:00
Laurent Destailleur
68a3c5b41c
Merge pull request #11853 from ptibogxiv/patch-259
...
NEW add supplier's product list
2019-09-15 17:04:17 +02:00
Laurent Destailleur
5d0ba10f34
Update api_products.class.php
2019-09-15 17:04:08 +02:00
Laurent Destailleur
0194f48041
Merge pull request #10795 from altatof/clonecat
...
NEW : copy linked categories on product clone process
2019-09-15 16:34:42 +02:00
Laurent Destailleur
4a815da993
Merge pull request #11854 from OPEN-DSI/new-formproduct-loadWarehouses-stockmin-order
...
NEW add minimum stock filter in load warehoues for product form
2019-09-14 17:09:27 +02:00
VESSILLER
44fa2e4cd1
NEW multiselect with checkbox in categories/tags search for product list
2019-09-13 12:23:34 +02:00
stickler-ci
1e8663b1c8
Fixing style errors.
2019-09-10 18:48:55 +00:00
ptibogxiv
651fbde64d
Merge branch 'develop' into patch-187
2019-09-10 20:46:54 +02:00
Laurent Destailleur
61cf47aa16
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-09-10 00:14:07 +02:00
VESSILLER
6a734ea828
NEW add minimum stock filter in load warehoues for product form
2019-09-09 16:58:20 +02:00
stickler-ci
be66e1bd20
Fixing style errors.
2019-09-09 14:36:02 +00:00
ptibogxiv
f4a565544f
Update api_products.class.php
2019-09-09 16:33:12 +02:00
Laurent Destailleur
a5f7211730
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/install/repair.php
2019-09-06 16:10:55 +02:00
Laurent Destailleur
348ab4765c
Fix sql injection
2019-09-06 15:20:04 +02:00
Laurent Destailleur
529dd05226
Replace deprecated code
2019-09-06 10:53:05 +02:00
Laurent Destailleur
80daf29d79
Fix conflict between new module reception and old process
...
Fix inventory record does not need status at creation
Conflicts:
htdocs/fourn/commande/card.php
2019-09-06 01:55:22 +02:00
Laurent Destailleur
04adbd8c80
Fix conflict between new module reception and old process
...
Fix inventory record does not need status at creation
2019-09-06 01:52:51 +02:00
Christophe Battarel
1cfd5615d3
resolv conflict
2019-09-05 16:10:23 +02:00
Laurent Destailleur
f893854986
Fix remove warnings
2019-09-05 14:24:13 +02:00
Tim Otte
0f9b01cd5b
Added support for extrafield styling options:
...
- visibility now implemented
- fieldrequired now implemented
2019-09-05 09:47:40 +02:00
Tim Otte
be000b96ee
Fixed error that occurred in the travis CI build
2019-09-04 16:42:13 +02:00
Tim Otte
fbafbc3e19
Added myself to the author list
2019-09-04 15:16:29 +02:00
Tim Otte
54d0b94b6d
Added extrafield support to the product supplier price lines
2019-09-04 15:13:42 +02:00
Frédéric FRANCE
a5aedacb7e
Update productbatch.class.php
2019-09-03 16:49:41 +02:00
Laurent Destailleur
ffcea3dfd8
Fix phpcs
2019-09-03 14:48:06 +02:00
Laurent Destailleur
71dadc9bd4
Merge pull request #11757 from ptibogxiv/patch-246
...
NEW purchase_prices API
2019-09-03 13:03:31 +02:00
Laurent Destailleur
d4fb1d134d
Merge pull request #11801 from jtraulle/fix-11682-10.0
...
Fix #11683 Correct links to create a new product or service from search results
2019-09-03 13:02:17 +02:00
Abbes Bahfir
f945ec5771
fix: convert posted price formatted values to numeric
2019-09-02 21:24:53 +01:00
Jean Traullé
c84f1baf17
Fix #11683 Correct links to create a new product or service from search results
2019-08-31 00:18:53 +02:00
Laurent Destailleur
321e41ceed
Fix graph
2019-08-30 04:17:07 +02:00
Laurent Destailleur
6009601254
Use graph for stats on products/services
2019-08-30 04:15:24 +02:00
Laurent Destailleur
55505604c1
Merge pull request #11397 from atm-josselin/FIX_product_document_and_special_characters
...
FIX : filepath of generated documents doesn't handle products with sp…
2019-08-27 14:12:48 +02:00
Laurent Destailleur
e8bb84e803
NEW Add status of warehouse in tooltip of a warehouse.
2019-08-26 23:54:15 +02:00
Laurent Destailleur
db6b1b6ffb
NEW Add status of warehouse in tooltip of a warehouse.
2019-08-26 23:44:20 +02:00
ptibogxiv
d7cc76b94a
NEW purchase_prices API
2019-08-26 20:10:00 +02:00
ptibogxiv
1b4788c6d0
Update product.class.php
2019-08-24 14:21:41 +02:00
Laurent Destailleur
3339f89fc5
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/api/class/api_login.class.php
htdocs/dav/fileserver.php
2019-08-22 12:45:23 +02:00
Laurent Destailleur
27cd6cd308
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/compta/paiement.php
htdocs/product/fournisseurs.php
htdocs/stripe/payment.php
2019-08-22 12:39:07 +02:00
Laurent Destailleur
a35f010e55
FIX name and position of hook FIX #11710
2019-08-22 12:30:14 +02:00
Laurent Destailleur
db220d25c2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-16 21:48:53 +02:00
Laurent Destailleur
467ad3ed22
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
htdocs/product/stock/card.php
2019-08-16 21:48:46 +02:00
Laurent Destailleur
9799153171
Merge pull request #11695 from jtraulle/fix-11683
...
Fix #11683 Correct links to create a new product or service from search results
2019-08-16 17:49:55 +02:00
Laurent Destailleur
ee50c41e74
Fix phpcs
2019-08-16 17:34:23 +02:00
Laurent Destailleur
48125fd957
Fix phpcs
2019-08-16 17:32:58 +02:00
Jean Traullé
4bed1b9a3d
Fix #11683 Correct links to create a new product or service from search results
2019-08-15 22:21:31 +02:00
Laurent Destailleur
fa53641221
Merge pull request #11551 from atm-quentin/NEW_global_search_product
...
NEW Add hidden option to set fields for the quick search on products
2019-08-15 20:26:05 +02:00
Laurent Destailleur
8a126800e7
Merge pull request #11650 from ptibogxiv/patch-217
...
FIX count negative in stats with credit note
2019-08-15 19:36:21 +02:00
Laurent Destailleur
b36df2303b
Update movement_list.php
2019-08-15 19:26:46 +02:00
atm-greg
f8ad8d72c0
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_fk_projet_on_stock_movement
2019-08-12 15:16:43 +02:00
atm-greg
acdf13d769
add fk_projet on stock movements
2019-08-12 15:08:15 +02:00
ptibogxiv
0ce22d68ef
Update product.class.php
2019-08-10 09:43:26 +02:00
ptibogxiv
4f69be2c2c
Update product.class.php
2019-08-10 09:12:40 +02:00
ptibogxiv
33cf4d8417
Update product.class.php
2019-08-10 09:12:15 +02:00
Laurent Destailleur
3351a1687c
Fix phpcs
2019-08-10 02:17:07 +02:00
Laurent Destailleur
8647a20c18
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/langs/en_US/admin.lang
htdocs/product/dynamic_price/class/price_parser.class.php
htdocs/product/stats/facture.php
2019-08-10 01:57:43 +02:00
Laurent Destailleur
2824dee11a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/product/dynamic_price/class/price_parser.class.php
2019-08-10 01:20:17 +02:00
Laurent Destailleur
6a8910f109
Merge pull request #11649 from ptibogxiv/patch-216
...
FIX qty in invoice list on product's stats
2019-08-10 00:37:35 +02:00
Je2fb
2dee289fc6
Update price_parser.class.php
...
Calculation with supplier_min_price work
Conflicts:
htdocs/product/dynamic_price/class/price_parser.class.php
2019-08-10 00:21:13 +02:00
Laurent Destailleur
88c66d24fe
Merge pull request #11662 from ptibogxiv/patch-219
...
FIX duration when creating service
2019-08-09 23:53:55 +02:00
Laurent Destailleur
6d4ba6b36b
Merge branch 'develop' into develop
2019-08-09 23:49:31 +02:00
Regis Houssin
0b831ccdf7
FIX better help message with multicompany
2019-08-09 09:33:14 +02:00
Je2fb
1a592f8f69
Update price_parser.class.php
2019-08-08 09:34:59 +02:00
Je2fb
4008ddc567
Update price_parser.class.php
2019-08-08 09:33:03 +02:00
ptibogxiv
322ec32ff5
FIX duration when creating service
2019-08-07 20:16:53 +02:00
Je2fb
ef285a87a8
Update price_parser.class.php
...
Calculation with supplier_min_price work
2019-08-07 17:16:34 +02:00
ptibogxiv
3e94b3dc59
FIX count negative in stats whithcredit note
2019-08-06 16:54:44 +02:00
ptibogxiv
0fc92b92a2
Update facture.php
2019-08-06 16:47:54 +02:00
ptibogxiv
ee8d99351d
Update facture.php
2019-08-06 16:28:18 +02:00
Frédéric FRANCE
69985339d8
Update price_parser.class.php
2019-08-06 11:47:34 +02:00
ptibogxiv
d22c2960b7
Update product.class.php
2019-08-06 00:14:19 +02:00
ptibogxiv
2d77bfd873
Update product.class.php
2019-08-04 14:50:25 +02:00
ptibogxiv
c9e481d6f7
Update product.class.php
2019-08-04 14:09:59 +02:00
ptibogxiv
f5f6882583
Update product.class.php
2019-08-04 13:42:50 +02:00
atm-quentin
bd2f5ba037
FIX Replace conf by hidden conf editable by user
2019-07-26 14:16:54 +02:00
Laurent Destailleur
0c6499f193
Update product.php
2019-07-25 18:01:47 +02:00
Laurent Destailleur
9a0e0fbdd2
Update product.php
2019-07-25 18:01:16 +02:00
Laurent Destailleur
a46bfc7a29
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/project.lib.php
2019-07-25 17:54:14 +02:00
Alexandre SPANGARO
323d2df210
Presentation nowrap on amount
2019-07-24 10:42:00 +02:00
atm-quentin
0ff121e7f1
add some new field on global search
2019-07-24 09:42:52 +02:00
atm-quentin
03ed4eb141
modif rowspan
2019-07-24 09:42:39 +02:00
atm-quentin
5a385bf1cc
ADD extrafields on global search
2019-07-24 09:41:02 +02:00
Laurent Destailleur
50480bf517
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/opensurvey/index.php
2019-07-18 18:23:24 +02:00
Laurent Destailleur
fb5af65f4d
FIX #11466
2019-07-15 23:56:05 +02:00
Laurent Destailleur
adfbd62f8b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-14 00:44:35 +02:00
Laurent Destailleur
694be619b2
Fix doxygen
2019-07-11 22:16:32 +02:00
Laurent Destailleur
f5cc29417d
Translation lignes -> lines
2019-07-05 21:50:35 +02:00
Laurent Destailleur
0a7d70829f
Translation of some comments
2019-07-05 21:37:25 +02:00
Laurent Destailleur
2fee41f712
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-04 12:27:00 +02:00
Laurent Destailleur
8e3620fce1
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/compta/facture/invoicetemplate_list.php
2019-07-04 12:26:17 +02:00
Laurent Destailleur
80bbc2577e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-04 12:09:26 +02:00
Laurent Destailleur
b065cbc6f8
FIX #11446
2019-07-04 12:09:04 +02:00
Laurent Destailleur
3d0a5d9f00
Merge pull request #11442 from atm-john/9.0_Fix_column_price_display
...
Fix column price display
2019-07-04 10:50:35 +02:00
John Botella
0288338364
Fix column price display
2019-07-02 14:38:09 +02:00
atm-quentin
8cdb251ca5
FIX product_use_units was set to 0 each time a conf in block other was set
2019-07-02 10:18:03 +02:00
atm-josselin
c24a95b7ad
Sanitize at creation of the product instead of the creation of the filepath
2019-07-01 09:31:01 +02:00
Laurent Destailleur
b177787f0a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
htdocs/product/class/product.class.php
2019-06-29 18:28:51 +02:00
Laurent Destailleur
adb3062a9f
Work on nblignes -> nblines
2019-06-29 16:38:14 +02:00
Laurent Destailleur
93b0e45246
Fix duplicate class in some cases
2019-06-29 02:27:58 +02:00
Laurent Destailleur
d71330c00b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-29 02:04:16 +02:00
Laurent Destailleur
36e240a16d
NEW Add statistics on product into contracts
2019-06-29 02:03:57 +02:00
Laurent Destailleur
8aebcc45b2
Fix message to not show sometimes
2019-06-29 01:54:38 +02:00
Laurent Destailleur
97827f5172
Fix print
2019-06-29 01:44:49 +02:00
Laurent Destailleur
1b33952028
Update facture.php
2019-06-28 12:37:22 +02:00
ptibogxiv
55bd67058b
Update facture.php
2019-06-26 14:10:52 +02:00
atm-quentin
7f62fdbfe4
FIX buyprice barcode default val
2019-06-25 14:27:44 +02:00
atm-quentin
4b3824a1a9
FIX buyprice barcode default val
2019-06-25 14:17:31 +02:00
Laurent Destailleur
fa476b4994
Properties ->libelle_incoterms were renamed into ->label_incoterms
2019-06-25 13:00:02 +02:00
Laurent Destailleur
3ca258c93d
Remove dead code
2019-06-24 22:58:21 +02:00
Laurent Destailleur
a7bd734ece
Rename ->produit into ->product. Still permissions to rename.
2019-06-24 21:18:49 +02:00
Laurent Destailleur
efa09301b1
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-22 20:19:14 +02:00
Laurent Destailleur
b202c7eaa0
Fix confusion between ->childs and ->childsoncascade
2019-06-22 20:17:40 +02:00
Laurent Destailleur
5675e7c50e
Clean code of deprecated method
2019-06-22 18:19:40 +02:00
Laurent Destailleur
b0c76f48e1
error management
2019-06-21 09:38:26 +02:00
Laurent Destailleur
8da5794777
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/accounting.lib.php
htdocs/product/stock/class/entrepot.class.php
2019-06-20 18:24:43 +02:00
Laurent Destailleur
e28bf71964
Fix error management of warehouse->delete
2019-06-20 18:15:14 +02:00
Laurent Destailleur
6975e18233
Fix phpcs
2019-06-20 13:59:04 +02:00
Laurent Destailleur
e9da44e023
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-20 12:33:02 +02:00
Laurent Destailleur
1a6dc83d4c
Fix: default accounting account for eec and export sales were not used.
2019-06-20 12:25:58 +02:00
Laurent Destailleur
d152354022
Merge pull request #11295 from OPEN-DSI/new-warehouse-extrafield
...
NEW add extrafields in warehouses
2019-06-20 03:16:49 +02:00
Laurent Destailleur
4308f48cad
Merge branch 'develop' into MissingHook
2019-06-20 03:04:32 +02:00
Alexandre SPANGARO
47c2f6fac4
NEW Add column VAT rate in product list
2019-06-19 21:35:35 +02:00
Nicolas ZABOURI
2e4db8c83c
Merge remote-tracking branch 'Dolibarr/10.0' into MissingHook
2019-06-19 08:39:05 +02:00
Laurent Destailleur
663998bab1
Fix scrutinizer errors
2019-06-18 20:15:04 +02:00
ICstage
820c420ae5
FIX Missing hooks
2019-06-18 14:07:52 +02:00
Laurent Destailleur
08d5ca4ddb
Debug page to export accounting documents
2019-06-17 17:53:43 +02:00
Francis Appels
a26c868783
Fix scrutinizer bugs
2019-06-12 22:05:10 +02:00
Francis Appels
2ecde139f0
Fix stock mouvement does not need virtual stock.
2019-06-07 18:09:03 +02:00
Josep Lluís
bb0313a1a4
Fix Hide disabled fields
...
Hide disabled fields in product list
2019-06-07 15:23:20 +02:00
Lionel VESSILLER
9a974814fa
NEW add extrafields in warehouses
...
- fix load lang stocks
2019-06-03 15:53:21 +02:00
Lionel VESSILLER
439eafb637
NEW add extrafields in warehouses
...
- create table
- admin extrafields
- object fecth, insert, update and delete extrafields
- card and list
2019-06-03 15:44:17 +02:00
Laurent Destailleur
2218994958
FIX Duplicate encoding on error message
2019-05-29 09:51:45 +02:00
Laurent Destailleur
815a467eb7
Debug clone of products
2019-05-22 19:54:03 +02:00
Laurent Destailleur
18f1952e2d
Fix set of properties
2019-05-22 14:49:18 +02:00
Laurent Destailleur
e60131e3ee
Fix look and feel v10
2019-05-22 13:42:27 +02:00
Laurent Destailleur
c1a0e9385f
Merge pull request #11219 from frederic34/patch-2
...
dol_print_object_info return void
2019-05-21 22:38:39 +02:00
Laurent Destailleur
22e897b1a1
Clean and prepare code to fix a SQL injection
2019-05-21 17:22:38 +02:00
Laurent Destailleur
e463b17c15
Fix look and feel v10
2019-05-21 15:31:56 +02:00
Laurent Destailleur
5f23cf7e2a
CSS
2019-05-19 13:51:47 +02:00
Frédéric FRANCE
53a09a0dd4
Update agenda.php
2019-05-19 09:15:51 +02:00
Laurent Destailleur
94f5f6c655
Merge pull request #11207 from atm-john/FIX_scrutyniser
...
FIX: scrutinizer feedback
2019-05-18 16:05:24 +02:00
Laurent Destailleur
11fea03074
Merge pull request #11026 from atm-john/new_look_and_feel_title_button
...
NEW : look and feel title button
2019-05-18 16:04:47 +02:00
ATM John BOTELLA
f714b45efb
FIX scrutinizer feedback
2019-05-18 15:53:07 +02:00
Laurent Destailleur
fd5048ef73
Fix reported by phpstan
2019-05-15 19:16:48 +02:00
Laurent Destailleur
49d65710ba
Fix date missing
2019-05-14 10:31:11 +02:00
Laurent Destailleur
04f7261bfc
Fix field date was not visible
2019-05-13 21:34:30 +02:00
Laurent Destailleur
75646e365d
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contrat/list.php
htdocs/contrat/services_list.php
htdocs/expensereport/list.php
htdocs/product/list.php
htdocs/product/reassort.php
htdocs/product/reassortlot.php
htdocs/projet/list.php
2019-05-13 12:28:16 +02:00
Laurent Destailleur
9242c1a630
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
ChangeLog
htdocs/contrat/services_list.php
htdocs/core/lib/files.lib.php
htdocs/filefunc.inc.php
htdocs/product/list.php
2019-05-13 12:22:14 +02:00
Juanjo Menent
f4ca6916cd
Merge remote-tracking branch 'upstream/7.0' into 8.0
...
# Conflicts:
# htdocs/contrat/services_list.php
# htdocs/expensereport/list.php
# htdocs/projet/list.php
2019-05-11 17:31:23 +02:00
Juanjo Menent
6206519456
Fix: missing GETPOST params
2019-05-11 16:54:56 +02:00
Juanjo Menent
2e6cb2afaa
Fix: missing GETPOST params
2019-05-11 16:53:16 +02:00
Juanjo Menent
dc9f8a349f
Fix: missing GETPOST params
2019-05-11 16:50:31 +02:00
Laurent Destailleur
3def11d5c9
Standardize translation
2019-05-10 19:32:46 +02:00
Laurent Destailleur
aaeb7dc9d6
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/holiday.php
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/filefunc.inc.php
htdocs/product/list.php
2019-05-10 17:45:33 +02:00
Laurent Destailleur
95326c3d63
Update list.php
2019-05-10 16:27:38 +02:00
John BOTELLA
f296093f8d
fix travis
2019-05-10 15:52:46 +02:00
Regis Houssin
8a29d9f2d1
FIX possibility to override permissions (multicompany)
2019-05-10 11:23:19 +02:00
Juanjo Menent
2df026b903
FIX : #11032
2019-05-09 20:59:22 +02:00
Laurent Destailleur
a94c291b76
Dolibarization
2019-05-09 16:59:06 +02:00
Laurent Destailleur
6e69db8a1a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/product/doc/pdf_standard.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
htdocs/filefunc.inc.php
2019-05-09 12:27:14 +02:00
Laurent Destailleur
c2abedeb24
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 9.0
2019-05-08 21:43:57 +02:00
Laurent Destailleur
b62b09df66
Merge pull request #11147 from frederic34/patch-2
...
fix reassort with not using product units
2019-05-08 18:33:10 +02:00
Laurent Destailleur
590b1d1e90
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
2019-05-08 18:24:50 +02:00
Laurent Destailleur
b5d8bc732d
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-05-08 18:22:11 +02:00
Frédéric FRANCE
5fd3109e7f
fix reassort with no product units
2019-05-08 16:28:18 +02:00
Laurent Destailleur
d86f0b7407
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-05-08 13:27:36 +02:00
Laurent Destailleur
a67d6e7208
css
2019-05-08 13:27:26 +02:00
Laurent Destailleur
af2c158821
Update reassort.php
2019-05-08 02:11:50 +02:00
Laurent Destailleur
953c9148ff
Update reassort.php
2019-05-08 02:11:12 +02:00
Rüdiger Hahn
475290a4b9
Show unit values if configured
...
Fix: Fetch unit values from db and display them if this has been configured
2019-05-07 09:02:48 +02:00
Laurent Destailleur
c4798c34b0
Fix autocompletion of product on stock correction
2019-05-07 00:26:31 +02:00
Laurent Destailleur
15dc5f9d23
Fix css
2019-05-04 16:46:09 +02:00
atm-greg
e0c3cf8360
fix project link for stock correction
2019-05-03 10:24:49 +02:00
Christophe Battarel
face07ece1
new constant PRODUCT_STATS_WITH_PARENT_PROD_IF_INCDEC
2019-05-01 15:15:20 +02:00
ptibogxiv
61f2b84f5f
FIX : error with call IsInEEC
2019-04-28 00:49:21 +02:00
Laurent Destailleur
091132de2f
Signatures of methods createFromClone() has been standardized. All
...
methods requires the object User as first parameter.
2019-04-25 12:11:32 +02:00
Laurent Destailleur
e5c2027dbb
NEW Add accounting code for eec sales and export sales on products
2019-04-25 01:16:29 +02:00
Laurent Destailleur
aa9184905a
FIX Duration is lost when editing
2019-04-25 00:11:08 +02:00
Laurent Destailleur
fe1b884966
Add missing methods
2019-04-23 12:20:59 +02:00
Laurent Destailleur
c0c723a207
Work on inventory feature
2019-04-23 11:00:28 +02:00
ATM-Nicolas
6cfdfe8408
NEW : Can update product supplier price ref
2019-04-19 10:58:18 +02:00
ATM john
684879d73c
apply appli btn to more elements
2019-04-16 21:49:26 +02:00
John BOTELLA
7372e8c610
Appli function to links
2019-04-15 15:47:36 +02:00
Laurent Destailleur
cf058e7d3b
NEW Ask date of invoice when using the Clone feature.
2019-04-12 12:12:08 +02:00
Laurent Destailleur
cb08bf6021
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/class/product.class.php
2019-04-11 16:25:33 +02:00
Laurent Destailleur
54b3acc997
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/product/class/product.class.php
2019-04-11 16:23:56 +02:00
Laurent Destailleur
8fa8d7fa08
FIX Combo list was limited to 20 in stock correction
2019-04-11 16:13:44 +02:00
Laurent Destailleur
be004c16c6
FIX Combo list was limited to 20 in stock correction
2019-04-11 16:13:23 +02:00
gauthier
9a24007c0a
FIX : better test
2019-04-11 15:32:50 +02:00
gauthier
524b186959
FIX : Product accountancey sell intra code must be visible if main feature level 1
2019-04-11 15:19:40 +02:00
Laurent Destailleur
3cfeba0113
Standardize code
2019-04-09 01:23:27 +02:00
Laurent Destailleur
d7f980fda0
NEW Add picto of deletion on mass action combo lists
2019-04-09 01:22:59 +02:00
Laurent Destailleur
7b01e76d2b
Fix doxygen
2019-04-08 16:04:15 +02:00
Ion
06d3b5792c
Fix dynamic prices bug caused by arg displacement
2019-04-07 21:41:31 +02:00
Christophe Battarel
8e2ef8e56c
remove old dev
2019-04-05 11:42:12 +02:00
Christophe Battarel
45b3a0588f
remove old dev
2019-04-05 11:40:57 +02:00
Christophe Battarel
f167ad910e
camelCase and generic cloneCategories function
2019-04-05 11:30:51 +02:00
Laurent Destailleur
fff9b7db9d
Fix doxygen
2019-04-04 18:33:12 +02:00
Laurent Destailleur
5891d0a056
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/list.php
htdocs/projet/list.php
2019-04-04 17:45:02 +02:00
Laurent Destailleur
9c7464d157
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/list.php
htdocs/societe/card.php
2019-04-04 17:42:12 +02:00
Laurent Destailleur
fa95f5575c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/product/list.php
2019-04-04 17:41:22 +02:00
Laurent Destailleur
eaf9a2402a
Fix length of label
2019-04-04 17:39:51 +02:00
Laurent Destailleur
e79204e81a
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/product/list.php
2019-04-04 17:13:52 +02:00
Laurent Destailleur
4489db2a70
Fix field surface/weight not loaded
2019-04-04 17:06:26 +02:00
Laurent Destailleur
993920628b
Fix phpcs
2019-04-03 12:33:24 +02:00
Laurent Destailleur
379f9f2d53
Fix phpcs
2019-04-02 20:36:00 +02:00
Laurent Destailleur
42fda54edf
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/card.php
htdocs/fichinter/list.php
htdocs/product/stock/replenish.php
2019-04-02 19:41:58 +02:00
Laurent Destailleur
c5348be337
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-04-02 19:35:42 +02:00
Laurent Destailleur
17a61b3232
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-04-02 19:34:49 +02:00
Laurent Destailleur
8fe1be1a67
Removed deprecated use of string in dol_print_date(). Only date allowed.
2019-04-01 19:27:34 +02:00
Laurent Destailleur
1b2826f476
Look and feel v10
2019-03-29 13:26:26 +01:00
Laurent Destailleur
50395b7dd7
New: Input field to search product always visible with focus so you can
...
use a barcode flasher at any time
2019-03-28 18:51:04 +01:00
atm-greg
957fae1081
missing params
2019-03-28 11:07:27 +01:00
atm-greg
11343e986c
add all missing hooks on replenish
2019-03-28 10:47:32 +01:00
Laurent Destailleur
f27f65e8bf
Responsive
2019-03-25 10:09:02 +01:00
Laurent Destailleur
1b558d70c1
Fix menu translation
2019-03-22 12:42:23 +01:00
Laurent Destailleur
1075ef8cf2
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-03-21 18:25:43 +01:00
Laurent Destailleur
f7f20df323
Merge pull request #10891 from atm-greg/Add_hook_on_replenish
...
Add hook on replenish
2019-03-21 18:23:06 +01:00
Laurent Destailleur
5d21547854
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/product/price.php
htdocs/user/perms.php
2019-03-21 12:20:24 +01:00
Laurent Destailleur
9a3c66b057
Merge pull request #10846 from grandoc/new_branch_15_03_2019
...
New branch 15 03 2019
2019-03-19 12:13:02 +01:00
Laurent Destailleur
1a8902f23e
Fix migration for compatibility
2019-03-19 12:03:02 +01:00
Laurent Destailleur
1a05cdfaa1
Fix regressions in selecting duration of service
2019-03-19 11:42:50 +01:00
ATM-Nicolas
1cf42726ff
FIX : Duplicate executeHook function
2019-03-18 15:19:39 +01:00
Christophe Battarel
7bc0260661
begin factorization of categories cloning
2019-03-18 14:15:55 +01:00
ptibogxiv
8657ff034b
Update card.php
2019-03-18 13:48:16 +01:00
Frédéric FRANCE
5e6d9691e4
phpcs fix
2019-03-16 19:12:45 +01:00
Laurent Destailleur
e7543a26b1
Merge branch 'develop' into patch-1
2019-03-16 14:22:36 +01:00
Philippe GRAND
bcfaf4bb1b
update with html5 compliant code
2019-03-15 09:55:06 +01:00
Philippe GRAND
c958bf49d0
update with html5 compliant code
2019-03-15 09:54:10 +01:00
Philippe GRAND
14abf357e7
update with html5 compliant code
2019-03-15 09:53:06 +01:00
Philippe GRAND
6bdac445c5
update with html5 compliant code
2019-03-15 09:50:53 +01:00
Philippe GRAND
89da4fbdc1
update with html5 compliant code
2019-03-15 09:49:07 +01:00
Philippe GRAND
7c916666a6
update with html5 compliant code
2019-03-15 09:48:32 +01:00
Laurent Destailleur
7c59629e66
Fix phpcs
2019-03-15 02:32:21 +01:00
Laurent Destailleur
86c5dc20e3
NEW Can choose the root category to show for TakePOS module
2019-03-15 02:12:40 +01:00
Laurent Destailleur
2713c430df
Merge branch 'develop' into dev_datepricefour
2019-03-14 18:43:09 +01:00
Laurent Destailleur
5aee322b30
Update fournisseurs.php
2019-03-14 18:36:05 +01:00
Laurent Destailleur
8f65ee2296
Merge branch 'develop' into NEW_develop_supplier_buyprice_barcode
2019-03-14 17:48:44 +01:00
Laurent Destailleur
3c40d5d30c
Merge pull request #10821 from OPEN-DSI/fix-select-measuring-units
...
Fix measure unit id in select options
2019-03-14 14:10:13 +01:00
Laurent Destailleur
993183aec6
Merge pull request #10817 from wdammak/patch-35
...
Fix Warning: Invalid argument - dynamic_price
2019-03-14 14:09:21 +01:00
Frédéric FRANCE
ba749ffc8c
Update product.class.php
2019-03-14 09:14:29 +01:00
Lionel VESSILLER
17dd88d397
Fix measure unit id in select options
2019-03-13 14:05:32 +01:00
wdammak
b651b7ec07
Fix Warning: Invalid argument - dynamic_price
2019-03-13 01:03:12 +01:00
Laurent Destailleur
98ca9bf17a
Reduce quantity of string to translates
2019-03-12 19:44:59 +01:00
Laurent Destailleur
3559d600e2
Merge pull request #10770 from atm-john/theme_badge_status
...
Add badge status css part1
2019-03-11 20:49:31 +01:00
John BOTELLA
57c6c60118
Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status
2019-03-11 14:44:35 +01:00
Christophe Battarel
3215e066e4
copy linked categories when cloning a product
2019-03-11 10:00:44 +01:00
Frédéric FRANCE
86c1694195
update doc in product class
2019-03-09 10:36:39 +01:00
Laurent Destailleur
d99f4c1726
Fix var not used
2019-03-09 01:08:50 +01:00
Scrutinizer Auto-Fixer
68188ffda1
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-03-09 00:02:05 +00:00
Frédéric FRANCE
e845b96f2b
Update product.class.php
2019-03-07 22:40:16 +01:00
Laurent Destailleur
4c75e6644d
Fix css
2019-03-07 21:57:03 +01:00
John BOTELLA
ca10b1e403
add new dolGetStatus to LibStatut in product class
2019-03-07 11:37:54 +01:00
Laurent Destailleur
a426c8e9bf
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/compta/facture/class/facture.class.php
htdocs/filefunc.inc.php
htdocs/install/upgrade2.php
htdocs/product/class/product.class.php
2019-03-07 11:16:24 +01:00
Laurent Destailleur
b15e00cae7
FIX Autodetect buy price for invoices autogenerated with templates.
2019-03-06 21:39:09 +01:00
Laurent Destailleur
ec15f9251d
Merge pull request #10738 from frederic34/patch-2
...
phpcs fix
2019-03-05 18:42:22 +01:00
Laurent Destailleur
db5dd7f9aa
Fix phpunit
2019-03-05 18:19:37 +01:00
Frédéric FRANCE
f283782445
change visibility
2019-03-04 19:57:46 +01:00
Laurent Destailleur
1d6028dfb0
FIX PHPUnit
2019-03-04 19:38:52 +01:00
Laurent Destailleur
06a40726bb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-03-04 16:29:23 +01:00
Laurent Destailleur
27402f432a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/don/class/don.class.php
htdocs/product/stock/card.php
htdocs/theme/eldy/style.css.php
2019-03-04 16:29:16 +01:00
Laurent Destailleur
3b48808916
Update list.php
2019-03-04 16:13:38 +01:00
Laurent Destailleur
16d13b223a
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-03-03 20:43:35 +01:00
Laurent Destailleur
526bd1d02e
Fix number format
2019-03-03 17:36:43 +01:00
futurehousestore
b710a41707
Update list.php
...
Display full product name
2019-03-03 16:23:10 +00:00
Frédéric FRANCE
014f69850e
add visibility
2019-03-01 23:08:57 +01:00
Frédéric FRANCE
bd2e541fd6
add visibility
2019-03-01 18:28:51 +01:00
Frédéric FRANCE
796ea6f4ea
add visibility
2019-02-28 23:19:58 +01:00
Frédéric FRANCE
4f9e35f350
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
2019-02-28 20:48:23 +01:00
Laurent Destailleur
9967adaf09
Merge pull request #10436 from wdammak/patch-23
...
Add links and related documents for a stock movement
2019-02-27 15:50:06 +01:00
atm-quentin
f51b89def3
NEW supplier buyprice barcode
2019-02-27 09:22:34 +01:00
Frédéric FRANCE
6ee186096c
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
2019-02-24 23:48:51 +01:00
Frédéric FRANCE
27218b7087
wip
2019-02-24 23:32:09 +01:00
Laurent Destailleur
6b46a927f1
Merge branch 'develop' into PSR2MethodsFunctionCallSignatureSpaceBeforeOpenBracket
2019-02-24 20:53:54 +01:00
Frédéric FRANCE
894123fb06
PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket
2019-02-24 20:06:55 +01:00
Frédéric FRANCE
167a857f4c
replace html code by html5 in contact
2019-02-24 14:47:47 +01:00
Frédéric FRANCE
a1d2d3bddc
replace html code by html5
2019-02-24 11:18:55 +01:00
Frédéric FRANCE
390766babf
replace html code by html5
2019-02-23 23:36:21 +01:00
Frédéric FRANCE
6ee29559f9
doc comment entrepot.class.php
2019-02-23 09:44:45 +01:00
Laurent Destailleur
ec5461a4d1
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/multicurrency/class/multicurrency.class.php
2019-02-21 22:31:27 +01:00
Laurent Destailleur
6cdf5c5673
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-02-21 22:28:25 +01:00
Regis Houssin
1c3541295b
FIX wrong class name "CUnits instead CMeasuringUnits"
2019-02-19 09:24:30 +01:00
Regis Houssin
45d05da6ed
FIX missing $ismultientitymanaged for previous/next ref
2019-02-14 16:14:19 +01:00
Laurent Destailleur
e6e18ff616
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/menus/edit.php
htdocs/product/stock/card.php
htdocs/product/stock/info.php
htdocs/product/stock/movement_list.php
2019-02-14 15:33:17 +01:00
Laurent Destailleur
89050da856
Merge
2019-02-14 15:27:31 +01:00
Laurent Destailleur
2c2052d113
Update card.php
...
Avoid regression on restrictArea
2019-02-14 15:23:34 +01:00
Laurent Destailleur
4ac086ab70
Update info.php
2019-02-14 15:23:07 +01:00
Laurent Destailleur
173d28cf5a
Update mouvement.php
...
Avoid regression on restrictArea
2019-02-14 15:22:22 +01:00
Regis Houssin
aa4c5ae839
FIX missing access security checking with multicompany
2019-02-14 10:12:15 +01:00
Laurent Destailleur
2311912d8a
Merge branch 'develop' into dev_importproduct_measuringunit
2019-02-13 16:35:46 +01:00
florian HENRY
020fa52507
travis
2019-02-13 15:30:20 +01:00
Frédéric FRANCE
fa6bc309d6
Merge branch 'develop' into fixphpcs
2019-02-13 15:24:37 +01:00
florian HENRY
5bb260d3d1
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_importproduct_measuringunit
Conflicts:
htdocs/product/stock/movement_card.php
2019-02-13 13:52:35 +01:00
florian HENRY
9caefc9483
fix travis
2019-02-13 13:50:57 +01:00
florian HENRY
dd9896516b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_importproduct_measuringunit
Conflicts:
htdocs/margin/agentMargins.php
htdocs/product/stock/movement_card.php
htdocs/projet/tasks/time.php
htdocs/resource/class/html.formresource.class.php
2019-02-13 12:52:07 +01:00
Laurent Destailleur
44fd36b15c
Fix phpcs
2019-02-13 12:39:26 +01:00
florian HENRY
37c66c2ece
travis
2019-02-13 12:32:06 +01:00
Laurent Destailleur
ced386fdca
Fix phpcs
2019-02-13 11:32:00 +01:00
florian HENRY
de87321c15
fix travcis
2019-02-13 10:28:08 +01:00
florian HENRY
5c059c897d
fix travis (mosty for dev no conerne by my changes)
2019-02-13 09:21:14 +01:00
florian HENRY
d88475c61a
Merge branch 'develop' of local repository into dev_importproduct_measuringunit
2019-02-13 08:59:18 +01:00
Frédéric FRANCE
484acc2e00
fix phpcs
2019-02-12 20:55:55 +01:00
florian HENRY
5b5f96bafb
NEW : measuring unit dictionnary and product size/unit import
2019-02-12 16:58:11 +01:00
Laurent Destailleur
41863bb127
Merge
2019-02-12 16:42:51 +01:00
Frédéric FRANCE
b041eeae22
first parameter of print_liste_field_titre was translated
2019-02-10 18:11:34 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature
2019-02-10 10:45:49 +01:00
Laurent Destailleur
38d4284638
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/db/pgsql.class.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/filefunc.inc.php
htdocs/imports/import.php
htdocs/supplier_proposal/card.php
2019-02-08 11:26:08 +01:00
Laurent Destailleur
fe1188c4ea
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/filefunc.inc.php
2019-02-08 10:44:45 +01:00
atm-quentin
730a2a90ff
FIX supplier invoice product stats total ht is line total not invoice total
2019-02-05 09:43:14 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
Laurent Destailleur
57f81217ee
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/localtax/index.php
htdocs/compta/tva/index.php
2019-02-03 21:14:44 +01:00
Laurent Destailleur
4d41b1b33c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-02-03 19:45:45 +01:00
Laurent Destailleur
a6dde3d6bd
Merge branch 'develop' into nospaceaftercomma
2019-02-03 19:27:16 +01:00
Laurent Destailleur
9f7dfe2921
Merge pull request #10481 from frederic34/psr2forloop
...
psr2 Squiz.ControlStructures.ForEachLoopDeclaration
2019-02-03 19:11:07 +01:00
Laurent Destailleur
e309261140
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-03 18:19:58 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
2019-02-03 14:29:45 +01:00
Maxime Kohlhaas
bb3225809b
Fix warehouse fetch was not checking parameters. Fixes #10414
2019-02-02 18:43:25 +01:00
Frédéric FRANCE
03701fa091
psr2
2019-02-02 18:25:01 +01:00
Laurent Destailleur
ebe30f7a0e
FIX error report not returned
2019-02-01 19:19:23 +01:00
Frédéric FRANCE
f5b2cf75f2
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-02-01 18:31:44 +01:00
Laurent Destailleur
6de732d7f8
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/facture/mod_facture_mars.php
htdocs/core/modules/facture/mod_facture_terre.php
2019-02-01 16:07:18 +01:00
Laurent Destailleur
35f65a571c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/modules/facture/mod_facture_mars.php
htdocs/core/modules/facture/mod_facture_terre.php
htdocs/fourn/commande/list.php
2019-02-01 16:05:43 +01:00
Pierre Ardoin
2d6f5ca8ab
#Fix : Error in Total Products/Services
...
Its correct an error in the total of stat Products/Services total.
2019-01-31 20:22:56 +01:00
Frédéric FRANCE
b766204690
wip
2019-01-30 22:53:47 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma
2019-01-30 18:27:35 +01:00
Laurent Destailleur
408609e0ec
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/tpl/objectline_edit.tpl.php
2019-01-30 16:54:38 +01:00
Laurent Destailleur
9fdba921b4
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/lib/functions.lib.php
2019-01-30 16:48:33 +01:00
Laurent Destailleur
81ae4c52c5
Merge pull request #10446 from mapiolca/8.0
...
Fix #10317 et #10318
2019-01-30 16:43:14 +01:00
Laurent Destailleur
d0b20178e0
Merge pull request #10442 from aspangaro/10.0_accountancy_default
...
NEW: When you create product or service, sell accountancy account by default are proposed
2019-01-30 16:30:13 +01:00
Laurent Destailleur
e72d6c50e6
Merge pull request #10428 from frederic34/toomanylines
...
PSR2.Files.EndFileNewline.TooMany
2019-01-30 16:17:09 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma
2019-01-30 16:00:11 +01:00
Pierre Ardoin
99892c13b0
FIX : Erreur dans le Total
...
Corrige l'erreur de calcul dans le total des produits et services
2019-01-29 23:26:08 +01:00
Alexandre SPANGARO
64975b3b9e
NEW: When you create product or service, sell accountancy account by default are proposed
2019-01-28 22:27:55 +01:00
Alexandre SPANGARO
cc88c4f8ff
Move my email to the new one
2019-01-28 21:39:22 +01:00
wdammak
7812baf8aa
Cleaning after using the movement card
2019-01-28 16:12:18 +01:00
wdammak
8546c801a5
to make it work with movement_card.php
2019-01-28 05:17:09 +01:00
wdammak
837821ebb6
Create movement_card.php
2019-01-28 05:12:20 +01:00
wdammak
49ccdb9602
Update movement_list.php
...
For it to work you have to create this script
htdocs\core\modules\stock\doc\pdf_stdmouvement.modules.php
instead
htdocs\core\modules\stock\doc\pdf_stdmovement.modules.php
this mixture of fr/en confused me and I'm sure you better control the structure to make it work properly
it tested & works but with htdocs\core\modules\stock\doc\pdf_stdmouvement.modules.php
thx
2019-01-28 05:06:02 +01:00
wdammak
aa08e32761
Add links and related documents for a stock movement
...
@eldy you can clone in movement_card.php if you prefer this structure
2019-01-28 04:48:59 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
Laurent Destailleur
ecc30b8ffe
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
2019-01-27 18:27:58 +01:00
Laurent Destailleur
12e75cb8c9
Merge pull request #10401 from aspangaro/10.0_accountancy2
...
NEW: Automatically binding for intra/export accountancy code in customer list
2019-01-27 18:06:08 +01:00
Laurent Destailleur
f30a3d59ba
Merge branch 'develop' into toomanylines
2019-01-27 17:59:13 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing
2019-01-27 15:20:16 +01:00
Frédéric FRANCE
496fa9b0fb
PSR2.Files.EndFileNewline.TooMany
2019-01-27 14:10:35 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged
2019-01-27 10:49:34 +01:00
Laurent Destailleur
cc574852d2
Fix phpcs
2019-01-26 15:20:36 +01:00
Laurent Destailleur
ab262237b2
Merge pull request #10393 from fappels/10_add_product_dimensions
...
NEW Show product dimensions in product list tooltip.
2019-01-26 14:14:03 +01:00
Laurent Destailleur
60c9eccbc4
Merge pull request #10395 from fappels/10_work_on_supplier_price_history
...
Work on #10394 supplier price history
2019-01-26 14:08:15 +01:00
Laurent Destailleur
a5daa25707
Move common code to get sell price into a method
2019-01-24 19:45:17 +01:00
Alexandre SPANGARO
9ff848210f
NEW: Automatically binding for intra/export accountancy code
2019-01-23 22:14:13 +01:00
jfefe
b3dfbaf38c
FIX: wrong permission test for inventory creation
2019-01-23 02:45:46 +01:00
Francis Appels
7ad48064be
Add code to show in fourn price tooltip.
2019-01-22 16:18:25 +01:00
Francis Appels
9227d9fe9b
Show product dimensions in product list tooltip.
2019-01-22 12:42:02 +01:00
Philippe GRAND
621b42e8e3
update with html5 compliant code
2019-01-21 10:02:11 +01:00
Laurent Destailleur
300889f53a
# WARNING: head commit changed in the meantime
...
Fix
2019-01-19 13:22:38 +01:00
Laurent Destailleur
2bbaae88d6
Fix standardize 'createfromclone' param when cloning
2019-01-19 12:46:38 +01:00
atm-quentin
013c078c8b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice
2019-01-16 10:52:46 +01:00
Laurent Destailleur
126e02798a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/cashdesk.lang
htdocs/langs/fr_FR/cashdesk.lang
2019-01-07 19:49:15 +01:00
Laurent Destailleur
1306918eb0
FIX #10299
2019-01-07 16:03:55 +01:00
JC Prieto
99e2f893fd
Fix: loadBatchInfo()
2019-01-02 19:38:44 +01:00
Laurent Destailleur
f965e9ec7a
Merge pull request #10270 from prietojc/patch-3
...
FIX: loadBatchInfo()
2019-01-02 19:38:25 +01:00
Laurent Destailleur
422e18ee8e
Merge pull request #10268 from hregis/develop_upgrade
...
FIX remove old unused and deprecated function "getStaticMember"
2019-01-02 19:37:49 +01:00
JC Prieto
d43adbce71
Fix: loadBatchInfo()
2018-12-26 20:42:26 +01:00
Laurent Destailleur
5c516fdae2
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2018-12-26 19:43:01 +01:00
Regis Houssin
1a15698f96
FIX replace deprecated "print_titre" with "load_fiche_titre"
...
Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>
2018-12-25 08:36:42 +01:00
Laurent Destailleur
85375495e5
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/product/class/product.class.php
htdocs/public/notice.php
htdocs/user/card.php
2018-12-22 19:06:58 +01:00
Laurent Destailleur
8d39edf430
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/product/price.php
2018-12-22 18:59:49 +01:00
Laurent Destailleur
850b939ffd
FIX CVE-2018-19994
2018-12-22 17:03:50 +01:00
Laurent Destailleur
44a6644969
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-12-18 21:55:53 +01:00
Laurent Destailleur
89068ffef1
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/adherents/subscription.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/langs/es_ES/companies.lang
htdocs/langs/es_ES/errors.lang
htdocs/product/stock/product.php
htdocs/user/card.php
2018-12-18 21:55:14 +01:00
ATM-Nicolas
96144e18f1
FIX : Function updatePrice with wrong parameters
2018-12-18 15:27:32 +01:00
Laurent Destailleur
af4405c669
FIX Replenishment with option STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE
2018-12-16 20:29:08 +01:00
Laurent Destailleur
d8b5cd4bdf
Remove white lines
2018-12-16 19:31:59 +01:00
Laurent Destailleur
efb88292dd
Clean code
2018-12-16 19:30:54 +01:00
Laurent Destailleur
003c463ee4
FIX Can't delete a line of minimal stock per warehouse
2018-12-16 19:23:53 +01:00
Laurent Destailleur
e14b426985
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/exports/export.php
2018-12-16 13:39:16 +01:00
Laurent Destailleur
54a4a54afe
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/langs/en_US/banks.lang
2018-12-15 20:00:31 +01:00
Norbert Penel
0f3a063c91
Events are not linked to products
...
when created from a product card, the events are not linked to the product
2018-12-15 15:57:15 +01:00
Laurent Destailleur
2d4403c3bf
Merge pull request #10184 from homer8173/patch-5
...
Events are not linked to products
2018-12-15 15:46:22 +01:00
Laurent Destailleur
1bce3f6c6b
Fix phpcs
2018-12-15 14:54:10 +01:00
Laurent Destailleur
27f8096afa
Merge branch 'develop' into PR_NEW_reception
2018-12-15 12:50:31 +01:00
Laurent Destailleur
2d2481cc5f
Merge pull request #10068 from prietojc/patch-2
...
New: Update just the multiprices that have been changed
2018-12-14 19:22:26 +01:00
Laurent Destailleur
88a52aa11d
Merge branch 'develop' into develop_mc
2018-12-14 15:58:52 +01:00
Laurent Destailleur
2011afe6fb
Merge branch 'develop' into actionrefused
2018-12-14 15:48:24 +01:00
Laurent Destailleur
83efdee7d3
Merge branch 'develop' into new_mass_generate
2018-12-14 15:44:46 +01:00
Laurent Destailleur
78cdade1a7
Merge pull request #10211 from atm-john/fix_error_message_details
...
Add détails to error message
2018-12-14 14:26:38 +01:00
Laurent Destailleur
177675b73d
Merge pull request #10225 from madx666/contrib
...
Change type_mouvement on movement_list
2018-12-14 10:40:00 +01:00
Laurent Destailleur
f97b561af0
Merge branch 'develop' into qual_rename_facnumber
2018-12-13 20:24:12 +01:00
madx666
3159c3f8d1
Change type_mouvement on movement_list
2018-12-13 11:28:49 +01:00
BENKE Charlene
946d55a7bb
fk_default_warehouse not defined
2018-12-12 00:41:11 +01:00
ATM John BOTELLA
6a4df05fd0
fix error message details
2018-12-08 17:29:07 +01:00
Norbert Penel
b4475e434f
Events are not linked to products
...
when created from a product card, the events are not linked to the product
2018-12-05 15:18:45 +01:00
Regis Houssin
8953a3ed73
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
Conflicts:
ChangeLog
2018-12-03 08:46:03 +01:00
Maxime Kohlhaas
2e496ea83a
QUAL rename facnumber by ref
2018-12-02 17:33:44 +01:00
Laurent Destailleur
6d84036f66
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/index.php
htdocs/contact/list.php
htdocs/core/class/html.form.class.php
htdocs/expensereport/card.php
htdocs/install/doctemplates/shipment/template_shipment.odt
htdocs/public/payment/newpayment.php
2018-12-01 19:23:06 +01:00
Laurent Destailleur
cb9ada2119
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/class/html.formmail.class.php
htdocs/core/modules/modSociete.class.php
htdocs/product/price.php
2018-12-01 18:19:45 +01:00
BENKE Charlene
1dc2fc5060
fix #9475
2018-12-01 16:17:52 +01:00
Inovea Conseil
0ba5fda3da
Update price.php
2018-12-01 16:11:49 +01:00
Inovea Conseil
8964ec7ea1
Fix #9572
...
Fix #9572
2018-12-01 15:58:37 +01:00
ptibogxiv
310dc46113
Update list.php
2018-11-29 13:44:42 +01:00
ptibogxiv
31e3b82ca6
Fix duration display product/service in list.php
2018-11-29 13:44:10 +01:00
Philippe GRAND
05d617b759
fix typo error
2018-11-26 14:33:45 +01:00
JC Prieto
54418c168b
New: Update only the multiprices that have been changed
...
When a multiprice was changed all level prices were updated at once and history of prices is getting very large.
2018-11-22 12:38:10 +01:00
Thibault Descamps
c2e5a29246
NEW redirect if only one result on global search on card
2018-11-22 11:36:30 +01:00
atm-quentin
7571760fdd
fix errors during cherry picking
2018-11-16 11:31:23 +01:00
atm-quentin
c18f486179
set facture to invoice AND check invoicenumber conf
2018-11-16 11:20:03 +01:00
atm-quentin
a8ab666d62
remplacement en masse des $conf->entity par des getEntity('facture')
2018-11-16 11:17:18 +01:00
Regis Houssin
aaa9a4f47c
FIX use getEntity('invoice') instead getEntity('facture')
2018-11-15 17:27:49 +01:00
Frédéric FRANCE
731d19a29b
add tooltip to butActionRefused
2018-11-13 21:40:17 +01:00
Laurent Destailleur
84983140b6
Merge pull request #9896 from hregis/develop_email
...
FIX change my deprecated email
2018-11-11 17:35:35 +01:00
Frédéric FRANCE
20acf440a3
Update api_products.class.php
2018-11-10 07:55:01 +01:00
Frédéric FRANCE
b271e1a3b0
The variable $i seems to be never defined.
2018-11-10 07:27:20 +01:00
Regis Houssin
89389baeac
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email
2018-11-09 15:37:29 +01:00
Laurent Destailleur
f1193ad3dd
FIX: Missing date creation and modification of supplier price
2018-11-09 10:29:22 +01:00
Laurent BOUQUET
320e7adef7
Fix blank lines and whitespace at end of lines
2018-11-08 17:09:54 +01:00
Laurent BOUQUET
b03a91213f
Merge branch 'develop' into feature/product-search-barcode
2018-11-08 16:57:49 +01:00
Laurent Destailleur
5bbf7e8f1d
Fix look and feel v8
2018-11-08 10:21:43 +01:00
Laurent Destailleur
66ffcf287a
Fix filter on extrafields
2018-11-07 12:49:17 +01:00
Laurent Bouquet
f05b67909b
NEW : Add product search from barcode via REST api
2018-11-06 12:13:16 +01:00
Laurent Bouquet
cb10da4d41
[Core] Add product search from barcode via REST api
2018-11-05 23:06:19 +01:00
Laurent Destailleur
4a25317f10
Fix security on GETPOST('action'). Param must be sanitized.
2018-11-05 20:29:07 +01:00
Laurent Destailleur
c0f4ec5a3e
FIX sanitize param $action
2018-11-05 17:53:31 +01:00
Regis Houssin
9589f69574
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_email
Conflicts:
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
2018-10-30 18:29:28 +01:00
Laurent Destailleur
68f6ebd0ff
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/core/lib/security.lib.php
htdocs/modulebuilder/template/myobject_card.php
2018-10-30 14:47:39 +01:00
Maxime Kohlhaas
46d3bec104
Fix replenish wasn't caring about supplier price min quantity #9561
2018-10-28 10:25:56 +01:00
Regis Houssin
569d59d251
FIX change my deprecated email
2018-10-27 14:43:12 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
2018-10-24 23:04:26 +02:00
Laurent Destailleur
6edaf3a422
Merge branch 'develop' into patch-9
2018-10-24 12:24:00 +02:00
Laurent Destailleur
24f37c7bd7
CSS
2018-10-24 12:12:06 +02:00
Laurent Destailleur
36323752ed
Project must be on a dedicated field
2018-10-24 12:00:54 +02:00
Laurent Destailleur
c2c4366c62
Removed duplicate translation
2018-10-24 11:38:16 +02:00
Laurent Destailleur
6d86727c0b
Lang not loaded
2018-10-24 11:34:00 +02:00
Laurent Destailleur
2e0de15f95
Add public
2018-10-24 11:26:50 +02:00
Laurent Destailleur
f0743c55bb
Fix phpcs
2018-10-24 11:24:10 +02:00
Laurent Destailleur
1a4bb7ed12
FIX hover on line of movement list
2018-10-24 11:23:21 +02:00
Frédéric FRANCE
2a6478a2c4
fix phpcs
2018-10-24 08:15:00 +02:00
Laurent Destailleur
eaab953ba2
Renamed mouvement.php into movement_list.php to follow dev rules
2018-10-24 03:50:18 +02:00
Laurent Destailleur
01adaf253c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/product/list.php
2018-10-24 03:35:44 +02:00
Laurent Destailleur
c8aa884462
Fix search all
2018-10-23 17:16:46 +02:00
Juanjo Menent
e40ee879dc
New: works with variants:
...
- If product is variant disable prices modify
- Add function isVariant for knowing if product is a Variant
2018-10-23 13:07:09 +02:00
Laurent Destailleur
7bb5e7c31f
Fix responsive
2018-10-23 11:52:21 +02:00
atm-quentin
8442b405b2
Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception
2018-10-23 10:27:46 +02:00
Laurent Destailleur
6a6a8ae14b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-19 14:29:22 +02:00
Laurent Destailleur
5a1a5548df
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/class/discount.class.php
htdocs/core/lib/payments.lib.php
htdocs/product/index.php
htdocs/product/list.php
htdocs/societe/class/societe.class.php
2018-10-19 14:27:15 +02:00
Laurent Destailleur
36ae81c749
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-10-19 14:17:20 +02:00
Laurent Destailleur
de4ead2558
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/accountancy/class/accountancycategory.class.php
htdocs/core/actions_massactions.inc.php
htdocs/product/reassort.php
2018-10-19 14:16:53 +02:00
Laurent Destailleur
5a9f0cbff7
Merge pull request #9796 from frederic34/patch-21
...
do not trim int
2018-10-19 13:26:08 +02:00
Frédéric FRANCE
ebc5cb5a96
do not trim int
2018-10-17 20:24:43 +02:00
Frédéric FRANCE
393303fe31
do not trim int
2018-10-17 20:17:43 +02:00
Ferran Marcet
ffde353441
FIX When delete a product, llx_product_association rows are not deleted
2018-10-17 10:06:06 +02:00
Ferran Marcet
bdae4e1c4d
FIX When delete a product, llx_product_association rows are not deleted
2018-10-17 10:04:42 +02:00
Ferran Marcet
b462e7b217
FIX When delete a product, llx_product_association rows are not deleted
2018-10-17 10:01:02 +02:00
Laurent Destailleur
57bb8bcfcd
Disabled action are hidden with reason
2018-10-16 20:27:33 +02:00
Laurent Destailleur
d43e1fcef6
Merge pull request #9729 from simnandez/develop
...
New: works with variants
2018-10-16 20:08:17 +02:00
Laurent Destailleur
97429aeb7a
Merge pull request #9721 from grandoc/new_branch_10_10_2018
...
Standardize and update code
2018-10-16 19:30:19 +02:00
Laurent Destailleur
2c1e8d6535
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/expedition/class/expeditionbatch.class.php
htdocs/public/payment/newpayment.php
htdocs/stripe/config.php
2018-10-16 18:47:11 +02:00
Philippe GRAND
729ff0b9bb
Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018
2018-10-16 14:20:11 +02:00
Juanjo Menent
194b3478f3
Merge remote-tracking branch 'upstream/develop' into develop
...
# Conflicts:
# htdocs/product/class/product.class.php
2018-10-15 13:40:42 +02:00
Laurent Destailleur
cca87f3d5a
Fix phpcs
2018-10-15 13:27:17 +02:00
Laurent Destailleur
6ab037c766
Fix code comment
2018-10-15 13:26:18 +02:00
Laurent Destailleur
f59dba66e7
Fix phpcs
2018-10-15 13:23:35 +02:00
Juanjo Menent
58cc9aa918
Fix: found 1 blank lines before brace
2018-10-15 12:45:40 +02:00
Juanjo Menent
c2814948fb
Fix: name of fields used into the search criteria must always start with "search_"
2018-10-15 11:48:55 +02:00
Juanjo Menent
e3643c7ab7
Merge remote-tracking branch 'upstream/develop' into develop
2018-10-15 11:44:50 +02:00
Maxime Kohlhaas
af813f8214
Fix missing status_batch var on product lists #9606
2018-10-14 19:55:25 +02:00
Laurent Destailleur
7e68d8df1b
Update product.class.php
2018-10-14 16:47:30 +02:00
Laurent Destailleur
5654492ba8
Update product.class.php
2018-10-14 16:45:45 +02:00
Laurent Destailleur
db2e1e09e7
Merge branch 'develop' into patch-112
2018-10-14 16:44:36 +02:00
Maxime Kohlhaas
d4d921b1cc
Add massaction generate on main lists
2018-10-14 16:27:59 +02:00
Laurent Destailleur
532e05c42e
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
2018-10-13 14:29:51 +02:00
atm-ph
7b17b453bf
Fix sort and switch page
2018-10-12 23:29:35 +02:00
atm-ph
23e4cd57f3
Fix warnings PHP7
2018-10-12 23:27:38 +02:00
Philippe GRAND
9e494e65e0
Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018
2018-10-12 19:04:02 +02:00
Philippe GRAND
357173f0ef
Standardize and update code
2018-10-12 09:30:53 +02:00
Philippe GRAND
849a1a9400
Standardize and update code
2018-10-12 09:26:58 +02:00
atm-ph
79420593f4
Fix display 0 (as virtual stock) instead of empty string
2018-10-11 17:14:22 +02:00
Juanjo Menent
0976616401
Fix: Opening brace should be on a new line
2018-10-11 17:13:39 +02:00
Juanjo Menent
ab55ff2e2c
New: works with variants:
...
- Make the checkbox working correctly
2018-10-11 15:44:23 +02:00
Laurent Destailleur
e6f179b6cb
Fix look
2018-10-11 13:33:44 +02:00
Juanjo Menent
58be4ac7a3
New: works with variants:
...
- Hide child products into list if PRODUIT_ATTRIBUTES_HIDECHILD is activated
2018-10-11 12:36:10 +02:00
Juanjo Menent
2ef0e95586
New: works with variants:
...
- If product is parent showing stock of childs and not itself
- Add function hasVariants for know if product has variants
2018-10-11 12:08:50 +02:00
Fernando Octavio García López
c7eb935cb8
FIX Fixed translatable field name in stock movement table
2018-10-10 22:57:08 -06:00
atm-quentin
aaace60b0d
FIX stock movement on close reception and set status if too much receive$
2018-10-10 15:33:35 +02:00
Laurent Destailleur
df0ec95b22
Code comment and better error message
2018-10-09 21:21:10 +02:00
Philippe GRAND
596dba9ce1
Standardize code
2018-10-06 12:14:47 +02:00
Philippe GRAND
b3925dd2bd
Standardize code
2018-10-05 16:04:10 +02:00
Philippe GRAND
073ec85208
Standardize code
2018-10-05 15:51:08 +02:00
Philippe GRAND
da560289e3
Standardize code
2018-10-05 15:48:38 +02:00
Philippe GRAND
d2ec703b51
Standardize and update code
2018-10-04 09:24:57 +02:00
atm-quentin
52717dbb65
NEW debut rename stock conf
2018-10-03 18:05:22 +02:00
Laurent Destailleur
75b1cac33f
FIX Pagination stats
2018-10-01 01:15:19 +02:00
Laurent Destailleur
d2e4752427
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-01 01:14:03 +02:00
Laurent Destailleur
d51eb1977a
FIX Pagination stats
2018-10-01 01:10:42 +02:00
Philippe GRAND
574cfad48f
Standardize and update code
2018-09-28 14:49:34 +02:00
Laurent Destailleur
62b31df069
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/rssparser.class.php
htdocs/langs/en_US/boxes.lang
2018-09-27 12:55:25 +02:00
Laurent Destailleur
575c63f87d
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/class/CMailFile.class.php
2018-09-27 12:52:10 +02:00
Laurent Destailleur
ff3f1e933a
Update replenish.php
2018-09-27 09:22:38 +02:00
gauthier
fc7c0ce521
FIX : need to filter on current entity on replenish
2018-09-24 16:23:44 +02:00
Frédéric FRANCE
6c8cbf710b
reduce complexity of ProductStockEntrepot class
2018-09-16 13:59:15 +02:00
Laurent Destailleur
d6ee00f2e7
Fix constructors does not need return value
2018-09-16 10:22:23 +02:00
Laurent Destailleur
bed8674714
Merge pull request #9519 from frederic34/patch-14
...
reduce complexity of libstatut inventory.class.php
2018-09-16 08:54:22 +02:00
Frédéric FRANCE
d2bd16280e
reduce complexity of libstatut inventory.class.php
2018-09-15 22:20:47 +02:00
Frédéric FRANCE
5d87847b65
reduce complexity of libstatut product.class.php
2018-09-15 22:13:54 +02:00
Frédéric FRANCE
987fdbe73c
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-12 21:29:41 +02:00
Frédéric FRANCE
ce76a2e714
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-12 20:21:35 +02:00
Frédéric FRANCE
a36f41728f
deprecate formbarcode:form_barcode_type
2018-09-10 23:58:57 +02:00
Frédéric FRANCE
312a606345
deprecate formbarcode:select_barcode_type
2018-09-10 23:50:48 +02:00
Frédéric FRANCE
f02b2f0239
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-09 13:35:58 +02:00
Frédéric FRANCE
a558c3bdac
replace select_date
2018-09-09 11:25:59 +02:00
Frédéric FRANCE
2b62c4ca8f
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-08 10:50:27 +02:00
Philippe GRAND
97c740f510
Merge branch 'develop' of github.com:grandoc/dolibarr into develop
2018-09-06 19:28:10 +02:00
Frédéric FRANCE
4cbfa2073a
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-05 21:02:16 +02:00
Laurent Destailleur
2a471df828
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-05 20:42:55 +02:00
