Alexandre SPANGARO
|
5528e9ef38
|
Work on split module fournisseur
|
2020-03-24 22:02:58 +01:00 |
|
Laurent Destailleur
|
23e06debb7
|
Popup is smaller
|
2020-03-22 11:52:02 +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
|
31865d7ae5
|
Fix doc
|
2020-03-12 12:39:21 +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
|
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 |
|
Laurent Destailleur
|
bfb9739ae8
|
Fix manufacuring efficiency on bom lines.
|
2020-02-28 16:12:42 +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 |
|
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
|
549bf076d7
|
Fix prefix of log
|
2020-02-17 12:22:52 +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 |
|
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 |
|
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
|
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
|
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 |
|
VESSILLER
|
c91ab621b8
|
FIX length, width and height coherence in product table
|
2020-01-21 17:49:27 +01:00 |
|
Laurent Destailleur
|
18f2b09fb1
|
Debug v11
|
2020-01-20 12:25:25 +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 |
|
Laurent Destailleur
|
2e8fd25299
|
FIX Local taxes was not correctly supported in TakePOS.
|
2020-01-01 21:54:47 +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
|
03649ea2c8
|
Fix pb with svg images
|
2019-12-19 19:10:23 +01:00 |
|
Frédéric FRANCE
|
9357bfd98e
|
doxygen
|
2019-12-12 08:17:14 +01:00 |
|
Frédéric FRANCE
|
650c9c2e57
|
Update product.class.php
|
2019-12-03 16:46:50 +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 |
|
Norbert Penel
|
89f57d7d3b
|
add label to combobox
useful for BOM, etc
|
2019-11-30 23:45:24 +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 |
|
atm-greg
|
ce15af0980
|
manage packaging on supplier prices
|
2019-11-23 15:52:34 +01: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 |
|
Scrutinizer Auto-Fixer
|
b40ecc3933
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:37:08 +00:00 |
|
Philippe GRAND
|
69e1d0480a
|
add some comment
|
2019-11-10 12:10:13 +01:00 |
|
Cédric
|
4dbf151b15
|
Inject $user in ProductCombination::updateProperties
|
2019-11-09 13:29:12 +01:00 |
|
Laurent Destailleur
|
e60fff39d9
|
Fix phpcs
|
2019-11-04 20:36:55 +01:00 |
|
Laurent Destailleur
|
8485747713
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-11-02 13:37:43 +01:00 |
|
Laurent Destailleur
|
9e69b12847
|
FIX #12281
|
2019-11-02 13:37:30 +01:00 |
|
Laurent Destailleur
|
d232b7a387
|
Merge pull request #12286 from grandoc/new_branch_01_11_2019
add some comment
|
2019-11-02 13:00:23 +01:00 |
|
Laurent Destailleur
|
45c77b4560
|
Renaming some libelle into label
|
2019-11-02 12:59:38 +01:00 |
|
Laurent Destailleur
|
c12e66e2a2
|
Merge branch 'develop' into new_branch_01_11_2019
|
2019-11-02 12:00:04 +01:00 |
|
Laurent Destailleur
|
e3b5be7475
|
All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
|
2019-11-01 12:52:03 +01:00 |
|
Philippe GRAND
|
07cd656a1c
|
add some comment
|
2019-11-01 10:56:46 +01:00 |
|
Laurent Destailleur
|
68a4ddceed
|
Look and feel v11
|
2019-10-31 23:29:17 +01:00 |
|
Frédéric FRANCE
|
5999d8a05a
|
Update product.class.php
|
2019-10-24 16:11:05 +02:00 |
|
Frédéric FRANCE
|
93a8b1d2a3
|
Update product.class.php
|
2019-10-24 16:09:35 +02:00 |
|
Laurent Destailleur
|
2e573fd794
|
Fix save of units
Conflicts:
htdocs/expedition/card.php
htdocs/product/card.php
htdocs/product/class/product.class.php
|
2019-10-23 03:03:55 +02:00 |
|
Laurent Destailleur
|
f0355b3057
|
Debug option PRODUCT_ADD_NET_MEASURE
|
2019-10-23 02:58:39 +02:00 |
|
Laurent Destailleur
|
c4be61c55c
|
FIX Better compatible fix for the trouble of weight / size units
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/product/card.php
|
2019-10-22 18:42:59 +02:00 |
|
Laurent Destailleur
|
e7e9898e0d
|
FIX Better compatible fix for the trouble of weight / size units
|
2019-10-22 18:36:36 +02:00 |
|
Frédéric FRANCE
|
86f22c4563
|
do not ignore lines with mix od tabs and spaces
|
2019-10-20 17:17:22 +02:00 |
|
Laurent Destailleur
|
24dc7fb667
|
Merge pull request #12173 from OPEN-DSI/new-product-clone-customer-prices
NEW add clone customers prices in clone product or service
|
2019-10-20 13:27:50 +02:00 |
|
Frédéric FRANCE
|
7581275316
|
wip
|
2019-10-20 11:59:21 +02:00 |
|
VESSILLER
|
801092d848
|
NEW add clone customers prices in clone product or service
|
2019-10-18 15:10:22 +02:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Laurent Destailleur
|
4ca9fddfcc
|
Update product.class.php
|
2019-10-16 14:26:49 +02:00 |
|
Cédric
|
3429cb7c1d
|
New: Update product type with update method
|
2019-10-14 22:42:38 +02:00 |
|
Laurent Destailleur
|
29384d9a71
|
Merge branch 'develop' into patch-187
|
2019-10-09 13:02:47 +02:00 |
|
ptibogxiv
|
10c29887d6
|
Update product.class.php
|
2019-10-08 16:15:12 +02:00 |
|
ptibogxiv
|
e2d76f6f24
|
Update product.class.php
|
2019-10-08 16:13:59 +02:00 |
|
altairis
|
85bbf1decb
|
Merge branch 'develop' into prodstats
|
2019-10-04 11:05:36 +02:00 |
|
Alexandre SPANGARO
|
91b3bf76fd
|
Merge branch 'develop' into 11.0_https
|
2019-10-01 06:11:43 +02:00 |
|
Laurent Destailleur
|
6858dce344
|
Rename table for categorie of warehouses
|
2019-09-27 13:28:28 +02:00 |
|
Laurent Destailleur
|
961f2b5165
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/categories/viewcat.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/takepos/invoice.php
|
2019-09-24 14:25:02 +02:00 |
|
Laurent Destailleur
|
6431e8e16d
|
FIX SQL injection on qty
|
2019-09-24 12:43:44 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
stickler-ci
|
1e8663b1c8
|
Fixing style errors.
|
2019-09-10 18:48:55 +00:00 |
|
ptibogxiv
|
651fbde64d
|
Merge branch 'develop' into patch-187
|
2019-09-10 20:46:54 +02:00 |
|
Laurent Destailleur
|
61cf47aa16
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-09-10 00:14:07 +02:00 |
|
Laurent Destailleur
|
a5f7211730
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/install/repair.php
|
2019-09-06 16:10:55 +02:00 |
|
Laurent Destailleur
|
348ab4765c
|
Fix sql injection
|
2019-09-06 15:20:04 +02:00 |
|
ptibogxiv
|
1b4788c6d0
|
Update product.class.php
|
2019-08-24 14:21:41 +02:00 |
|
ptibogxiv
|
0ce22d68ef
|
Update product.class.php
|
2019-08-10 09:43:26 +02:00 |
|
ptibogxiv
|
4f69be2c2c
|
Update product.class.php
|
2019-08-10 09:12:40 +02:00 |
|
ptibogxiv
|
33cf4d8417
|
Update product.class.php
|
2019-08-10 09:12:15 +02:00 |
|
ptibogxiv
|
3e94b3dc59
|
FIX count negative in stats whithcredit note
|
2019-08-06 16:54:44 +02:00 |
|
ptibogxiv
|
d22c2960b7
|
Update product.class.php
|
2019-08-06 00:14:19 +02:00 |
|
ptibogxiv
|
2d77bfd873
|
Update product.class.php
|
2019-08-04 14:50:25 +02:00 |
|
ptibogxiv
|
c9e481d6f7
|
Update product.class.php
|
2019-08-04 14:09:59 +02:00 |
|
ptibogxiv
|
f5f6882583
|
Update product.class.php
|
2019-08-04 13:42:50 +02:00 |
|
Laurent Destailleur
|
adfbd62f8b
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-14 00:44:35 +02:00 |
|
Laurent Destailleur
|
694be619b2
|
Fix doxygen
|
2019-07-11 22:16:32 +02:00 |
|
Laurent Destailleur
|
b065cbc6f8
|
FIX #11446
|
2019-07-04 12:09:04 +02:00 |
|
atm-josselin
|
c24a95b7ad
|
Sanitize at creation of the product instead of the creation of the filepath
|
2019-07-01 09:31:01 +02:00 |
|
Laurent Destailleur
|
b177787f0a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
htdocs/product/class/product.class.php
|
2019-06-29 18:28:51 +02:00 |
|
Laurent Destailleur
|
93b0e45246
|
Fix duplicate class in some cases
|
2019-06-29 02:27:58 +02:00 |
|
Laurent Destailleur
|
36e240a16d
|
NEW Add statistics on product into contracts
|
2019-06-29 02:03:57 +02:00 |
|
Laurent Destailleur
|
3ca258c93d
|
Remove dead code
|
2019-06-24 22:58:21 +02:00 |
|
Laurent Destailleur
|
b202c7eaa0
|
Fix confusion between ->childs and ->childsoncascade
|
2019-06-22 20:17:40 +02:00 |
|
Laurent Destailleur
|
1a6dc83d4c
|
Fix: default accounting account for eec and export sales were not used.
|
2019-06-20 12:25:58 +02:00 |
|