Laurent Destailleur
fa8b960520
Clean code
2020-11-30 13:22:48 +01:00
Mickael Desgranges
283c83cae0
FIX: undefined measuring_units_squared() on update
...
On update product, by a third party module, measuring_units_squared() and measuring_units_cubed() was undefined
2020-11-30 09:04:13 +01:00
Laurent Destailleur
5ed2bbb204
Fix error message
2020-11-27 16:13:27 +01:00
Laurent Destailleur
574919de52
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/accountancy/bookkeeping/balance.php
htdocs/adherents/class/subscription.class.php
htdocs/compta/bank/categ.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/boxes/box_task.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/class/interfaces.class.php
htdocs/core/lib/project.lib.php
htdocs/core/modules/modCategorie.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/install/repair.php
htdocs/main.inc.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
htdocs/reception/card.php
2020-11-27 15:45:12 +01:00
Laurent Destailleur
ac3c129735
Clean code
2020-11-27 14:24:15 +01:00
BENKE Charlene
5b40950f50
Update card.php
...
add on card
2020-11-26 12:45:06 +01:00
BENKE Charlene
c2bd30a7e9
working progress
2020-11-26 11:59:00 +01:00
Laurent Destailleur
74605cec12
Fix warning
2020-11-25 18:07:52 +01:00
stickler-ci
89759174dd
Fixing style errors.
2020-11-25 09:45:04 +00:00
Regis Houssin
a0dcbb3b79
FIX missing "price_base_type" and refactor to include cache
2020-11-25 10:40:38 +01:00
Laurent Destailleur
e35c745838
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/list.php
2020-11-24 13:41:46 +01:00
Laurent Destailleur
faa33f2d3c
FIX #15501
2020-11-24 12:52:39 +01:00
Laurent Destailleur
bc1d286673
Merge pull request #15495 from Givriz/dev
...
Feature : creation of a "button-cancel" class
2020-11-23 21:53:45 +01:00
Laurent Destailleur
1e70790cd6
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/price.php
2020-11-23 19:55:13 +01:00
Laurent Destailleur
9cb5673c36
Fix remove var_dump
2020-11-23 19:46:24 +01:00
Laurent Destailleur
c5278197fb
More phpunit test for price2num
2020-11-23 19:45:11 +01:00
Laurent Destailleur
e7dbc8407f
FIX formating of prices with foreign languages
2020-11-23 19:08:26 +01:00
Givriz
dca4cf5987
Feature : ajout de la class "button-cancel"
...
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
2020-11-23 15:12:52 +01:00
Laurent Destailleur
2f6f242d99
CSS
2020-11-23 12:29:38 +01:00
Laurent Destailleur
3d2da45f84
Remove warning
2020-11-22 11:36:07 +01:00
Laurent Destailleur
fe0764be6e
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
htdocs/expedition/class/expedition.class.php
htdocs/product/class/product.class.php
2020-11-22 02:32:47 +01:00
Laurent Destailleur
60bfbe2e57
Merge pull request #15448 from Givriz/dev
...
Feature : creation of a "button-save" class
2020-11-21 23:44:30 +01:00
Francis Appels
064b5acff5
List supplier barcode
2020-11-20 17:16:49 +01:00
Damien BENOIT
ebd64d5e57
Merge pull request #5 from Dolibarr/develop
...
Update fork
2020-11-20 13:53:43 +01:00
Laurent Destailleur
6976471988
Merge pull request #15442 from hregis/develop_bug2
...
FIX to preserve order of multiprices fields
2020-11-20 13:38:19 +01:00
Laurent Destailleur
2368b5199d
Merge pull request #15453 from frederic34/patch-18
...
add filters
2020-11-20 13:35:49 +01:00
Regis Houssin
265d19f563
FIX better method to preserve order
2020-11-20 08:07:44 +01:00
Frédéric FRANCE
19a64a8350
add filters
2020-11-19 21:19:54 +01:00
Frédéric FRANCE
bf535c0dec
remove warnings
2020-11-19 21:12:16 +01:00
Givriz
c48129e279
Ajout de la class "button-save"
...
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
2020-11-19 20:23:38 +01:00
Laurent Destailleur
772d401a64
FIX Restore a more common behavior. Add a hidden constant to switch to a
...
mode when we must enabled load of shippable status.
2020-11-19 19:56:00 +01:00
Regis Houssin
524aa96880
FIX to preserve order of multiprices fields
2020-11-19 14:14:43 +01:00
Florian HENRY
46326d7659
merge from develop
2020-11-19 13:53:34 +01:00
Laurent Destailleur
4ae121d870
FIX Can't create shipment for virtual product. Add
...
STOCK_EXCLUDE_VIRTUAL_PRODUCTS as a quick hack to solve this.
2020-11-16 19:43:45 +01:00
Laurent Destailleur
6bbeb6d3a0
Fix debug creation of shipment with virtual product.
2020-11-16 16:31:05 +01:00
Laurent Destailleur
d8753ea224
Fix trans
2020-11-16 14:15:54 +01:00
Laurent Destailleur
5c15162c40
Fix warning
2020-11-15 15:10:15 +01:00
Laurent Destailleur
8aaee7fa5e
Fix replenishment must exclude parent of variants.
2020-11-13 11:28:02 +01:00
Laurent Destailleur
a98d025f5a
Clean option for replenishment on real stock.
2020-11-13 11:06:51 +01:00
Josep Lluís
ef3f344631
FIX consider customer prices by qty in ajax fetch
...
Consider the experimental function PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES (customer prices by qty) in ajax product fetch
2020-11-10 16:35:38 +01:00
Laurent Destailleur
6536208a14
Merge pull request #15322 from OPEN-DSI/new-list-include-array-extra-fields-with-langfile
...
NEW include tpl for loading lang file for extra fields in list
2020-11-10 14:42:21 +01:00
Laurent Destailleur
47b3b30aaa
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/fourn/product/list.php
htdocs/product/fournisseurs.php
htdocs/societe/card.php
2020-11-10 11:10:35 +01:00
Laurent Destailleur
da6c6c9e0a
Clean code
2020-11-08 14:39:20 +01:00
Laurent Destailleur
924923ec41
Fix warning
2020-11-07 19:48:42 +01:00
lvessiller
4ddff7173f
NEW include tpl for loading lang file for extra fields in list
2020-11-06 12:19:45 +01:00
Laurent Destailleur
ed8a0093ff
Debug v13
2020-11-05 22:25:14 +01:00
Laurent Destailleur
6080e5335f
Minor fix
2020-11-05 12:56:20 +01:00
Laurent Destailleur
dd97ae94d0
css
2020-11-05 11:24:33 +01:00
Laurent Destailleur
2668c07e5a
Clean code
2020-11-03 01:25:58 +01:00
Laurent Destailleur
83a7b19333
Look and feel v13
2020-11-02 11:41:07 +01:00
Laurent Destailleur
e0ed89c514
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/compta/facture/card.php
htdocs/contrat/class/contrat.class.php
htdocs/core/actions_addupdatedelete.inc.php
htdocs/product/class/product.class.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
2020-11-01 17:58:41 +01:00
Laurent Destailleur
45f834cb15
FIX #15199
2020-11-01 15:20:33 +01:00
Frédéric FRANCE
d9bf49c5dc
phpcs
2020-10-31 21:04:38 +01:00
Scrutinizer Auto-Fixer
ab25e047c0
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 17:51:30 +00:00
stickler-ci
284c9bc6a8
Fixing style errors.
2020-10-31 13:34:01 +00:00
Scrutinizer Auto-Fixer
7f52920716
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 13:32:18 +00:00
Frédéric FRANCE
8190711342
doxygen
2020-10-30 18:01:01 +01:00
Laurent Destailleur
a24071492e
Start fix for php8 compatibility
2020-10-30 05:56:07 +01:00
Laurent Destailleur
f9713a5752
Merge pull request #15206 from frederic34/patch-10
...
The constant MissingIds was not found.
2020-10-29 17:46:16 +01:00
Frédéric FRANCE
f5673fd08a
doxygen
2020-10-28 22:47:29 +01:00
Frédéric FRANCE
09b8d166dd
The constant MissingIds was not found.
...
The constant MissingIds was not found. Maybe you did not declare it correctly or list all dependencies?
2020-10-28 18:21:45 +01:00
Florian HENRY
4b7707cc7c
Merge github.com:Dolibarr/dolibarr into dev_new_add_desc_when_select_product
2020-10-28 17:17:52 +01:00
Laurent Destailleur
ef59b71cdf
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/class/product.class.php
htdocs/product/stats/card.php
2020-10-28 17:02:20 +01:00
Laurent Destailleur
f02a35d398
Fix bad array when year is not defined into graph stat of products
2020-10-28 16:47:00 +01:00
Florian HENRY
d77a0b40a8
tested and approuve feaure #15036
2020-10-28 16:37:41 +01:00
Laurent Destailleur
6363a6cd60
Fix sanitize
2020-10-28 14:11:46 +01:00
Laurent Destailleur
47dfe633f9
Fix filter on date on statistics of products
2020-10-28 13:19:35 +01:00
Florian HENRY
a3073be8e4
Merge github.com:Dolibarr/dolibarr into dev_new_add_desc_when_select_product
2020-10-28 08:52:29 +01:00
Laurent Destailleur
9595d56235
Merge pull request #15186 from fappels/13_fix_delete_product_ajax
...
Fix delete product using ajax
2020-10-27 20:03:00 +01:00
Scrutinizer Auto-Fixer
a2a9c51e50
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-27 18:46:07 +00:00
Francis Appels
828df6c134
Fix delete product using ajax
2020-10-27 19:45:12 +01:00
Laurent Destailleur
ec6c735d89
Clean code
2020-10-27 19:44:15 +01:00
Laurent Destailleur
f54f67cae3
Fix sanitizing
2020-10-27 19:06:41 +01:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end
2020-10-27 18:19:31 +01:00
Laurent Destailleur
0abce469e9
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-10-26 19:09:08 +01:00
Laurent Destailleur
f18a13b2d4
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/product/class/productcustomerprice.class.php
2020-10-26 19:08:11 +01:00
Laurent Destailleur
78a52eda96
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/main.inc.php
htdocs/product/class/productcustomerprice.class.php
2020-10-26 19:05:30 +01:00
Florian HENRY
76824c868b
clean get price for fourn and labal for supplier coducment
2020-10-26 16:31:07 +01:00
Marc de Lima Lucio
3f839c2a96
FIX: product customer prices: missing triggers in CRUD class
2020-10-26 16:11:21 +01:00
Marc de Lima Lucio
496c31d63a
NEW: ref in product customer price: add field in forms and form handlers
2020-10-26 12:18:24 +01:00
Marc de Lima Lucio
c2518e92fb
NEW: ref in product customer price: add field in views
2020-10-26 11:50:04 +01:00
Marc de Lima Lucio
6a3150028c
NEW: ref in product customer price: fix price update SQL
2020-10-26 11:47:01 +01:00
Marc de Lima Lucio
721e931ba7
NEW: ref in product customer price: add field in CRUD class
2020-10-26 11:04:06 +01:00
Florian HENRY
925dfd36b5
syntax
2020-10-25 19:15:10 +01:00
Florian HENRY
7c2b5b614f
NEW: preload product description on selection for customer propal/order/invoice
2020-10-25 19:13:09 +01:00
Laurent Destailleur
4d9c8e2225
Merge pull request #15124 from frederic34/retrieve
...
retrieve the spelling
2020-10-25 14:48:51 +01:00
Frédéric FRANCE
7cfa710d48
replace & by &&
2020-10-23 21:53:18 +02:00
Frédéric FRANCE
ae3228b9e0
retrieve the spelling 🎉
2020-10-23 20:08:35 +02:00
Laurent Destailleur
6b6ce568c7
Merge pull request #15109 from frederic34/patch-6
...
doxygen
2020-10-23 04:07:29 +02:00
Frédéric FRANCE
9a470fa42d
replace deprecated
2020-10-22 22:50:03 +02:00
Frédéric FRANCE
ae1adfb2d7
Update product.class.php
2020-10-22 22:33:35 +02:00
Laurent Destailleur
42963f3059
Merge pull request #15105 from frederic34/patch-6
...
Update product.class.php
2020-10-22 21:36:11 +02:00
Laurent Destailleur
9699bdc0fa
Fix phpcs
2020-10-22 21:31:34 +02:00
Frédéric FRANCE
36ad3bfbc9
Update product.class.php
2020-10-22 21:11:49 +02:00
Laurent Destailleur
fb7202b7f8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-10-22 17:55:47 +02:00
Laurent Destailleur
0616b9bc9b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/card.php
htdocs/compta/prelevement/line.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/functions2.lib.php
htdocs/core/tpl/card_presend.tpl.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fourn/class/fournisseur.commande.class.php
2020-10-22 17:55:38 +02:00
Laurent Destailleur
a17c391efe
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
htdocs/product/composition/card.php
2020-10-22 17:38:48 +02:00
Laurent Destailleur
cfcac7e053
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/lib/functions2.lib.php
2020-10-22 17:34:48 +02:00
Laurent Destailleur
3369379ba1
Update card.php
2020-10-22 16:34:23 +02:00
Marc de Lima Lucio
34dd486b6c
FIX: virtual products: displayed value is by unit
2020-10-22 16:18:37 +02:00
Marc de Lima Lucio
a232a19e7d
FIX: virtual products: supplier discount was not applied in component list
2020-10-22 15:16:33 +02:00
kamel
134994882c
NEW : Calculate the virtual stock in transverse mode ( not on getEntity('commande'), ... but on getEntity('stock') )
2020-10-20 15:52:29 +02:00
Laurent Destailleur
7504f92a41
Standardize code and look and feel
2020-10-16 13:30:20 +02:00
Florian HENRY
6a4e01de1d
fix review
2020-10-15 08:36:04 +02:00
stickler-ci
ee631e629f
Fixing style errors.
2020-10-14 16:22:11 +00:00
Florian HENRY
9c3988da5c
add show empty
2020-10-14 18:19:41 +02:00
Florian HENRY
bcb98d1d67
Merge github.com:Dolibarr/dolibarr into dev_add_dict_NatureOfProductType
2020-10-14 18:16:34 +02:00
Florian HENRY
50a9bd368c
review
2020-10-14 18:15:48 +02:00
Florian HENRY
7d09f22afa
add correct import and dict edition
2020-10-14 16:39:42 +02:00
Florian HENRY
940d478aec
UI and db OK
2020-10-14 15:54:48 +02:00
Florian HENRY
90df353f0c
fix number of lines
2020-10-14 14:30:07 +02:00
Florian HENRY
a2ef7bc61e
add select
2020-10-14 14:26:40 +02:00
Florian HENRY
2d1d76b5a3
add credentials
2020-10-14 12:26:10 +02:00
Florian HENRY
ca37827e72
Merge branch 'dev_objectrefferent_for_BOM' of github.com:FHenry/dolibarr into dev_objectrefferent_for_BOM
2020-10-14 11:20:48 +02:00
Florian HENRY
14a3e30270
fix travis
2020-10-14 11:20:27 +02:00
stickler-ci
8bfb04ea7f
Fixing style errors.
2020-10-14 08:34:30 +00:00
Florian HENRY
08379cbfc6
Merge branch 'dev_objectrefferent_for_BOM' of github.com:FHenry/dolibarr into dev_objectrefferent_for_BOM
2020-10-14 10:32:07 +02:00
Florian HENRY
ee67d2b1a8
fixnhish bom product stats
2020-10-14 10:30:39 +02:00
stickler-ci
7abb0caf91
Fixing style errors.
2020-10-14 06:47:16 +00:00
Florian HENRY
74155a49be
finish BOM stat referent object
2020-10-14 08:42:57 +02:00
Florian HENRY
739de365c0
load stat_bom
2020-10-12 13:52:50 +02:00
Laurent Destailleur
3805a7877b
Update fournisseurs.php
2020-10-12 13:05:18 +02:00
Florian HENRY
c3a900a41c
need to update packaging quantity
2020-10-12 11:44:12 +02:00
Florian HENRY
df4b208de1
fix: add missing edit field with pakaging option on
2020-10-12 11:10:49 +02:00
Scrutinizer Auto-Fixer
1512521d91
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-07 13:01:28 +00:00
Laurent Destailleur
e3542c6d4f
Merge pull request #14848 from TobiasSekan/ShowCategoryInListOnlyWithRights
...
NEW Show category filter on lists only when user have rights to read categories
2020-10-06 12:29:10 +02:00
Laurent Destailleur
a6fe03bd14
Fix doc
2020-10-04 23:30:41 +02:00
Laurent Destailleur
cab2c24e27
Merge branch 'develop' into patch-43
2020-10-03 15:51:38 +02:00
Laurent Destailleur
50ca9f4145
Clean code
2020-10-02 19:10:30 +02:00
Laurent Destailleur
b15d862f36
Merge pull request #14870 from atm-john/12.0_add_filters_on_tab_soc_price
...
ADD : Filters more filters on customer price tab
2020-10-02 15:40:52 +02:00
stickler-ci
2ea6c092a4
Fixing style errors.
2020-10-02 13:05:50 +00:00
Laurent Destailleur
bede4040f6
Update productcustomerprice.class.php
2020-10-02 15:04:03 +02:00
Laurent Destailleur
ce1c5c6873
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/stripe/class/stripe.class.php
htdocs/takepos/invoice.php
2020-10-01 19:43:23 +02:00
Laurent Destailleur
f79bce638a
Merge pull request #14872 from FHenry/develop
...
fix remove php warning non-numeric value
2020-10-01 19:18:11 +02:00
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
