Laurent Destailleur
3d96c5a454
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/admin/dict.php
htdocs/bom/tpl/objectline_create.tpl.php
htdocs/bom/tpl/objectline_edit.tpl.php
htdocs/bom/tpl/objectline_view.tpl.php
htdocs/core/boxes/box_shipments.php
htdocs/societe/class/societe.class.php
2021-01-06 20:20:37 +01:00
Laurent Destailleur
eac711f96c
Debug v13
2020-12-27 21:41:39 +01:00
Laurent Destailleur
e89a410e59
Fix warning
2020-12-27 20:33:07 +01:00
Laurent Destailleur
70df6130b5
Fix SQL to export categories of contact
...
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/product/class/product.class.php
2020-12-23 15:45:33 +01:00
Laurent Destailleur
8658f903fa
FIX Must delete extrafields before main table on product deletion.
2020-12-23 15:00:25 +01:00
ptibogxiv
4ca6e38f5f
FIX variant api code v13+
...
Better clean code
2020-12-21 16:07:46 +01:00
Laurent Destailleur
a67068ab7b
Fix warnings
2020-12-17 18:08:56 +01:00
Laurent Destailleur
b0d524beed
Debug v13
2020-12-17 11:57:12 +01:00
Laurent Destailleur
371a460905
More PHPUnit for movements
2020-12-16 12:26:01 +01:00
Laurent Destailleur
37fe5bb3ef
Solve blocking feature. Can increase stock of a Kit without changing
...
subproduct stock.
2020-12-15 15:18:01 +01:00
Laurent Destailleur
a2bd920371
Fix translation of units
2020-12-15 11:39:18 +01:00
Laurent Destailleur
8a0c065163
Debug v13
2020-12-11 16:30:45 +01:00
Laurent Destailleur
70b772cf74
Kit must show details on PDF.
2020-12-08 21:56:48 +01:00
Laurent Destailleur
a0b1bd3eca
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expedition/card.php
htdocs/product/class/product.class.php
2020-12-08 18:03:01 +01:00
Laurent Destailleur
6beba9e351
Merge pull request #15674 from frederic34/patch-14
...
fix undefined variable
2020-12-07 22:34:10 +01:00
Laurent Destailleur
efc3bad7c6
Merge pull request #15678 from frederic34/fk_element
...
doxygen
2020-12-07 22:31:08 +01:00
Laurent Destailleur
669205af1c
Update product.class.php
2020-12-07 19:02:49 +01:00
Frans Bosman
7ad70c7c21
Update product.class.php
...
Added Hidden Option STOCK_DEFAULT_BATCH, in order to replace the default '000000' batchnumber for the existing stock when batchnumbers are enabled for a product.
2020-12-07 14:33:44 +01:00
Laurent Destailleur
8b3edd36ea
Fix warning
2020-12-07 10:37:55 +01:00
Laurent Destailleur
abadd2b803
Clean phpunit
2020-12-06 19:33:43 +01:00
Frédéric FRANCE
4e18f46f28
doxygen
2020-12-05 23:53:55 +01:00
Frédéric FRANCE
758bb20750
fix undefined variable
2020-12-05 18:55:39 +01:00
Laurent Destailleur
10bef6eb03
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/opensurvey/class/opensurveysondage.class.php
htdocs/product/class/product.class.php
htdocs/supplier_proposal/card.php
2020-12-04 19:24:29 +01:00
Laurent Destailleur
c1b6e58bbd
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-12-04 19:12:22 +01:00
Francis Appels
223205cf9d
Fix volume calcution, depends on surface not surface_units
...
surface_unit can be 0 for m2
2020-12-04 16:54:40 +01:00
Scrutinizer Auto-Fixer
6df4954b20
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-12-01 01:41:19 +00: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
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
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
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
ed8a0093ff
Debug v13
2020-11-05 22:25:14 +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
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
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
Frédéric FRANCE
f5673fd08a
doxygen
2020-10-28 22:47:29 +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
Laurent Destailleur
47dfe633f9
Fix filter on date on statistics of products
2020-10-28 13:19:35 +01:00
Laurent Destailleur
ec6c735d89
Clean code
2020-10-27 19:44:15 +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
Marc de Lima Lucio
3f839c2a96
FIX: product customer prices: missing triggers in CRUD class
2020-10-26 16:11:21 +01:00
Frédéric FRANCE
ae3228b9e0
retrieve the spelling 🎉
2020-10-23 20:08:35 +02:00
Frédéric FRANCE
ae1adfb2d7
Update product.class.php
2020-10-22 22:33:35 +02:00
Frédéric FRANCE
36ad3bfbc9
Update product.class.php
2020-10-22 21:11:49 +02:00
