Laurent Destailleur
4ca0942229
Addoption in get_arbo_each_prod for performance enhancement
2021-03-14 23:44:20 +01:00
Laurent Destailleur
12f50a76d7
Fix yogosha #5627
2021-03-14 11:48:39 +01:00
Laurent Destailleur
14d6893c63
Complete fields of product
2021-03-08 18:56:32 +01:00
Laurent Destailleur
66e7a9b283
NEW API Add option $includeifobjectisused to get a product
2021-03-08 16:17:20 +01:00
Christophe Battarel
83350cde8f
remove hidden constant MAIN_ADVANCE_NUMLOT
2021-03-04 15:40:23 +01:00
Laurent Destailleur
42329b10c9
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
build/generate_filelist_xml.php
htdocs/comm/propal/card.php
htdocs/commande/card.php
htdocs/compta/facture/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/modulebuilder.lib.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/supplier_proposal/card.php
htdocs/ticket/list.php
2021-03-02 15:27:20 +01:00
Laurent Destailleur
b8bd5cd0ee
FIX Protection to avoid #16504
2021-03-01 23:08:03 +01:00
Laurent Destailleur
84219689a6
Look and feel v14
2021-02-27 02:00:00 +01:00
Laurent Destailleur
8e632d08b8
NEW Add link picto to the stock movement on the detail of production
2021-02-27 00:31:29 +01:00
Frédéric FRANCE
96b0f3a25c
code syntax directory
2021-02-26 16:19:52 +01:00
Frédéric FRANCE
8029a3317f
Merge remote-tracking branch 'upstream/develop' into product_code_syntax
2021-02-26 16:11:34 +01:00
Laurent Destailleur
b95fd1697f
Merge pull request #16434 from altairisfr/serials_pr
...
differentiate serial numbers from lot management
2021-02-26 15:06:35 +01:00
Frédéric FRANCE
fa7cd70052
code syntax product directory
2021-02-26 14:25:17 +01:00
Laurent Destailleur
618d40d1a5
Merge branch 'develop' into develop
2021-02-26 13:17:12 +01:00
Laurent Destailleur
f5406d487b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/class/html.formmail.class.php
htdocs/core/lib/product.lib.php
htdocs/product/stock/productlot_card.php
test/phpunit/SecurityTest.php
2021-02-26 12:53:06 +01:00
Laurent Destailleur
0f44bdb90f
Fix sql error
2021-02-26 11:27:03 +01:00
Christophe Battarel
a3a8e7c4e4
change hasBatch function
2021-02-25 15:35:45 +01:00
Christophe Battarel
a61fa2b049
differentiate serial numbers from lot management
2021-02-25 15:15:00 +01:00
dvdwalker
3b49792985
Update product.class.php
2021-02-24 10:38:11 -03:00
Laurent Destailleur
1b129831a9
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-09 14:09:46 +01:00
Laurent Destailleur
48a4ed656b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/projet/element.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2021-02-09 14:08:49 +01:00
Florian HENRY
d3d0617996
fix: manage price min for PRODUIT_CUSTOMER_PRICES
2021-02-02 13:43:33 +01:00
Frédéric FRANCE
84985c5065
add status and status_buy
2021-01-19 18:01:30 +01:00
Laurent Destailleur
b553dbb9d2
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-06 20:23:07 +01:00
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
17b68a30d7
Merge branch 'develop' into dev_add_tag_on_massaction
2020-12-30 13:10:02 +01:00
Florian HENRY
806b40662f
merge develop
2020-12-28 21:15:25 +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
Florian HENRY
26d3ea2227
on going
2020-12-23 23:32:50 +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
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
