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 |
|
ATM John BOTELLA
|
f714b45efb
|
FIX scrutinizer feedback
|
2019-05-18 15:53:07 +02:00 |
|
Christophe Battarel
|
face07ece1
|
new constant PRODUCT_STATS_WITH_PARENT_PROD_IF_INCDEC
|
2019-05-01 15:15:20 +02:00 |
|
Laurent Destailleur
|
cb08bf6021
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/class/product.class.php
|
2019-04-11 16:25:33 +02:00 |
|
Laurent Destailleur
|
54b3acc997
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/product/class/product.class.php
|
2019-04-11 16:23:56 +02:00 |
|
gauthier
|
9a24007c0a
|
FIX : better test
|
2019-04-11 15:32:50 +02:00 |
|
gauthier
|
524b186959
|
FIX : Product accountancey sell intra code must be visible if main feature level 1
|
2019-04-11 15:19:40 +02:00 |
|
Laurent Destailleur
|
fff9b7db9d
|
Fix doxygen
|
2019-04-04 18:33:12 +02:00 |
|
Laurent Destailleur
|
50395b7dd7
|
New: Input field to search product always visible with focus so you can
use a barcode flasher at any time
|
2019-03-28 18:51:04 +01:00 |
|
Frédéric FRANCE
|
ba749ffc8c
|
Update product.class.php
|
2019-03-14 09:14:29 +01:00 |
|
Laurent Destailleur
|
3559d600e2
|
Merge pull request #10770 from atm-john/theme_badge_status
Add badge status css part1
|
2019-03-11 20:49:31 +01:00 |
|
John BOTELLA
|
57c6c60118
|
Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status
|
2019-03-11 14:44:35 +01:00 |
|
Frédéric FRANCE
|
86c1694195
|
update doc in product class
|
2019-03-09 10:36:39 +01:00 |
|
Scrutinizer Auto-Fixer
|
68188ffda1
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-03-09 00:02:05 +00:00 |
|
Frédéric FRANCE
|
e845b96f2b
|
Update product.class.php
|
2019-03-07 22:40:16 +01:00 |
|
John BOTELLA
|
ca10b1e403
|
add new dolGetStatus to LibStatut in product class
|
2019-03-07 11:37:54 +01:00 |
|
Laurent Destailleur
|
a426c8e9bf
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/compta/facture/class/facture.class.php
htdocs/filefunc.inc.php
htdocs/install/upgrade2.php
htdocs/product/class/product.class.php
|
2019-03-07 11:16:24 +01:00 |
|
Laurent Destailleur
|
b15e00cae7
|
FIX Autodetect buy price for invoices autogenerated with templates.
|
2019-03-06 21:39:09 +01:00 |
|
Frédéric FRANCE
|
27218b7087
|
wip
|
2019-02-24 23:32:09 +01:00 |
|
Frédéric FRANCE
|
970392adb8
|
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
|
2019-02-03 22:41:57 +01:00 |
|
Frédéric FRANCE
|
80a12fcd1c
|
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
|
2019-02-03 14:29:45 +01:00 |
|
Laurent Destailleur
|
648eea3a70
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 16:00:11 +01:00 |
|
Alexandre SPANGARO
|
cc88c4f8ff
|
Move my email to the new one
|
2019-01-28 21:39:22 +01:00 |
|
Frédéric FRANCE
|
b10558bacd
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-27 23:23:38 +01:00 |
|
Laurent Destailleur
|
4f9f0fd7b5
|
Merge branch 'develop' into elseif
|
2019-01-27 17:54:06 +01:00 |
|
Frédéric FRANCE
|
f0cdf300d1
|
Squiz.Functions.FunctionDeclarationArgumentSpacing
|
2019-01-27 15:20:16 +01:00 |
|
Frédéric FRANCE
|
7ee086b402
|
PSR2 space after comma in function call
|
2019-01-27 11:55:16 +01:00 |
|
Frédéric FRANCE
|
6e91b3cefc
|
PSR2 usage of else if is discouraged
|
2019-01-27 10:49:34 +01:00 |
|
Laurent Destailleur
|
cc574852d2
|
Fix phpcs
|
2019-01-26 15:20:36 +01:00 |
|
Laurent Destailleur
|
ab262237b2
|
Merge pull request #10393 from fappels/10_add_product_dimensions
NEW Show product dimensions in product list tooltip.
|
2019-01-26 14:14:03 +01:00 |
|
Laurent Destailleur
|
a5daa25707
|
Move common code to get sell price into a method
|
2019-01-24 19:45:17 +01:00 |
|
Francis Appels
|
9227d9fe9b
|
Show product dimensions in product list tooltip.
|
2019-01-22 12:42:02 +01:00 |
|
ldestailleur
|
bc00fb177a
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-01-02 19:42:15 +01:00 |
|
JC Prieto
|
99e2f893fd
|
Fix: loadBatchInfo()
|
2019-01-02 19:38:44 +01:00 |
|
Laurent Destailleur
|
5c516fdae2
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.form.class.php
|
2018-12-26 19:43:01 +01:00 |
|
Laurent Destailleur
|
85375495e5
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/product/class/product.class.php
htdocs/public/notice.php
htdocs/user/card.php
|
2018-12-22 19:06:58 +01:00 |
|
Laurent Destailleur
|
850b939ffd
|
FIX CVE-2018-19994
|
2018-12-22 17:03:50 +01:00 |
|
Laurent Destailleur
|
54a4a54afe
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/langs/en_US/banks.lang
|
2018-12-15 20:00:31 +01:00 |
|
Laurent Destailleur
|
27f8096afa
|
Merge branch 'develop' into PR_NEW_reception
|
2018-12-15 12:50:31 +01:00 |
|
Laurent Destailleur
|
88a52aa11d
|
Merge branch 'develop' into develop_mc
|
2018-12-14 15:58:52 +01:00 |
|
BENKE Charlene
|
946d55a7bb
|
fk_default_warehouse not defined
|
2018-12-12 00:41:11 +01:00 |
|
Regis Houssin
|
aaa9a4f47c
|
FIX use getEntity('invoice') instead getEntity('facture')
|
2018-11-15 17:27:49 +01:00 |
|
Regis Houssin
|
89389baeac
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email
|
2018-11-09 15:37:29 +01:00 |
|
Laurent BOUQUET
|
320e7adef7
|
Fix blank lines and whitespace at end of lines
|
2018-11-08 17:09:54 +01:00 |
|
Laurent Bouquet
|
f05b67909b
|
NEW : Add product search from barcode via REST api
|
2018-11-06 12:13:16 +01:00 |
|
Laurent Bouquet
|
cb10da4d41
|
[Core] Add product search from barcode via REST api
|
2018-11-05 23:06:19 +01:00 |
|
Regis Houssin
|
569d59d251
|
FIX change my deprecated email
|
2018-10-27 14:43:12 +02:00 |
|
Frédéric FRANCE
|
86d854f3f4
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
|
2018-10-24 23:04:26 +02:00 |
|
Laurent Destailleur
|
6edaf3a422
|
Merge branch 'develop' into patch-9
|
2018-10-24 12:24:00 +02:00 |
|
Laurent Destailleur
|
2e0de15f95
|
Add public
|
2018-10-24 11:26:50 +02:00 |
|
Laurent Destailleur
|
f0743c55bb
|
Fix phpcs
|
2018-10-24 11:24:10 +02:00 |
|
Frédéric FRANCE
|
2a6478a2c4
|
fix phpcs
|
2018-10-24 08:15:00 +02:00 |
|
Juanjo Menent
|
e40ee879dc
|
New: works with variants:
- If product is variant disable prices modify
- Add function isVariant for knowing if product is a Variant
|
2018-10-23 13:07:09 +02:00 |
|
atm-quentin
|
8442b405b2
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception
|
2018-10-23 10:27:46 +02:00 |
|
Laurent Destailleur
|
6a6a8ae14b
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-10-19 14:29:22 +02:00 |
|
Laurent Destailleur
|
5a1a5548df
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/class/discount.class.php
htdocs/core/lib/payments.lib.php
htdocs/product/index.php
htdocs/product/list.php
htdocs/societe/class/societe.class.php
|
2018-10-19 14:27:15 +02:00 |
|
Laurent Destailleur
|
de4ead2558
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/accountancy/class/accountancycategory.class.php
htdocs/core/actions_massactions.inc.php
htdocs/product/reassort.php
|
2018-10-19 14:16:53 +02:00 |
|
Ferran Marcet
|
ffde353441
|
FIX When delete a product, llx_product_association rows are not deleted
|
2018-10-17 10:06:06 +02:00 |
|
Ferran Marcet
|
bdae4e1c4d
|
FIX When delete a product, llx_product_association rows are not deleted
|
2018-10-17 10:04:42 +02:00 |
|
Ferran Marcet
|
b462e7b217
|
FIX When delete a product, llx_product_association rows are not deleted
|
2018-10-17 10:01:02 +02:00 |
|
Laurent Destailleur
|
d43e1fcef6
|
Merge pull request #9729 from simnandez/develop
New: works with variants
|
2018-10-16 20:08:17 +02:00 |
|
Philippe GRAND
|
729ff0b9bb
|
Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018
|
2018-10-16 14:20:11 +02:00 |
|
Juanjo Menent
|
194b3478f3
|
Merge remote-tracking branch 'upstream/develop' into develop
# Conflicts:
# htdocs/product/class/product.class.php
|
2018-10-15 13:40:42 +02:00 |
|
Laurent Destailleur
|
cca87f3d5a
|
Fix phpcs
|
2018-10-15 13:27:17 +02:00 |
|
Laurent Destailleur
|
6ab037c766
|
Fix code comment
|
2018-10-15 13:26:18 +02:00 |
|
Laurent Destailleur
|
f59dba66e7
|
Fix phpcs
|
2018-10-15 13:23:35 +02:00 |
|
Juanjo Menent
|
58cc9aa918
|
Fix: found 1 blank lines before brace
|
2018-10-15 12:45:40 +02:00 |
|
Juanjo Menent
|
e3643c7ab7
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2018-10-15 11:44:50 +02:00 |
|
Laurent Destailleur
|
7e68d8df1b
|
Update product.class.php
|
2018-10-14 16:47:30 +02:00 |
|
Laurent Destailleur
|
5654492ba8
|
Update product.class.php
|
2018-10-14 16:45:45 +02:00 |
|
Laurent Destailleur
|
db2e1e09e7
|
Merge branch 'develop' into patch-112
|
2018-10-14 16:44:36 +02:00 |
|
Philippe GRAND
|
849a1a9400
|
Standardize and update code
|
2018-10-12 09:26:58 +02:00 |
|
Juanjo Menent
|
0976616401
|
Fix: Opening brace should be on a new line
|
2018-10-11 17:13:39 +02:00 |
|
Juanjo Menent
|
ab55ff2e2c
|
New: works with variants:
- Make the checkbox working correctly
|
2018-10-11 15:44:23 +02:00 |
|
Juanjo Menent
|
2ef0e95586
|
New: works with variants:
- If product is parent showing stock of childs and not itself
- Add function hasVariants for know if product has variants
|
2018-10-11 12:08:50 +02:00 |
|
Philippe GRAND
|
596dba9ce1
|
Standardize code
|
2018-10-06 12:14:47 +02:00 |
|
atm-quentin
|
52717dbb65
|
NEW debut rename stock conf
|
2018-10-03 18:05:22 +02:00 |
|
Laurent Destailleur
|
d6ee00f2e7
|
Fix constructors does not need return value
|
2018-09-16 10:22:23 +02:00 |
|
Frédéric FRANCE
|
5d87847b65
|
reduce complexity of libstatut product.class.php
|
2018-09-15 22:13:54 +02:00 |
|
Frédéric FRANCE
|
65b74ad30f
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-04 20:48:35 +02:00 |
|
Frédéric FRANCE
|
3e723af018
|
start changing phpcs:ignore
|
2018-09-01 23:46:13 +02:00 |
|
Philippe GRAND
|
5d273960dc
|
fix conflict
|
2018-09-01 22:40:38 +02:00 |
|
Laurent Destailleur
|
c8912d6a4f
|
Merge pull request #9242 from frederic34/camelCaps
mark non camelCaps function
|
2018-09-01 15:37:56 +02:00 |
|
Philippe GRAND
|
45cbc36a15
|
Standardize and update code
|
2018-09-01 15:27:55 +02:00 |
|
Laurent Destailleur
|
bcee0ef0ae
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/commande/dispatch.php
htdocs/societe/class/societe.class.php
htdocs/stripe/config.php
|
2018-09-01 14:16:57 +02:00 |
|
Laurent Destailleur
|
26cff9e11f
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/langs/en_US/blockedlog.lang
htdocs/stripe/config.php
|
2018-09-01 14:13:01 +02:00 |
|
Laurent Destailleur
|
123a66dc2a
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/product/class/product.class.php
|
2018-09-01 14:09:00 +02:00 |
|
Frédéric FRANCE
|
57fb3dc2f4
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-09-01 13:52:51 +02:00 |
|
atm-greg
|
f8fef61075
|
remove useless db begin
|
2018-08-30 09:19:44 +02:00 |
|
Frédéric FRANCE
|
6aee680a4f
|
PSR2 ClassDeclaration
|
2018-08-29 22:06:05 +02:00 |
|
Frédéric FRANCE
|
b03f4004ea
|
PSR2 FunctionClosingBrace
|
2018-08-29 21:25:22 +02:00 |
|
Frédéric FRANCE
|
fe4260a014
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-28 09:34:53 +02:00 |
|
Laurent Destailleur
|
7219bac0b2
|
Merge pull request #9168 from frederic34/trimtrailing
Trimtrailing
|
2018-08-28 02:30:02 +02:00 |
|
Laurent Destailleur
|
1842a4bb41
|
Merge pull request #9278 from grandoc/new_branch_21_08_2018
Update and standardize code
|
2018-08-28 02:13:28 +02:00 |
|
Laurent Destailleur
|
534eadb7a2
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2018-08-28 01:35:43 +02:00 |
|
Norbert Penel
|
f9c1dd8edd
|
There is a begin transaction without rollback
In this Select, there is no need of this Begin Transaction on my understanding.
Don't know why this line code is here for.
|
2018-08-28 01:32:55 +02:00 |
|
Philippe GRAND
|
87067b2bc9
|
Standardize and update code
|
2018-08-23 18:35:45 +02:00 |
|
Norbert Penel
|
92b0668e3e
|
There is a begin transaction without rollback
In this Select, there is no need of this Begin Transaction on my understanding.
Don't know why this line code is here for.
|
2018-08-23 17:40:40 +02:00 |
|
Philippe GRAND
|
0c75c41e7b
|
Update and standardize code
|
2018-08-22 19:56:24 +02:00 |
|
Frédéric FRANCE
|
6b6daf178f
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-21 20:57:58 +02:00 |
|
Frédéric FRANCE
|
aba69b94b2
|
Merge remote-tracking branch 'upstream/develop' into trimtrailing
|
2018-08-21 14:03:02 +02:00 |
|
Frédéric FRANCE
|
39462742e2
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-16 08:17:55 +02:00 |
|
Laurent Destailleur
|
b515511ad6
|
Merge branch 'develop' into FunctionDeclaration
|
2018-08-16 00:52:55 +02:00 |
|
Laurent Destailleur
|
5c712a6cd3
|
Merge branch 'develop' into trimtrailing
|
2018-08-16 00:47:09 +02:00 |
|
Frédéric FRANCE
|
7bb781eea8
|
function declaration
|
2018-08-15 14:28:34 +02:00 |
|
Frédéric FRANCE
|
5146ab9177
|
trim
|
2018-08-14 15:34:44 +02:00 |
|
Frédéric FRANCE
|
a0a6afc224
|
return comment
|
2018-08-14 12:23:10 +02:00 |
|
Frédéric FRANCE
|
850ac34020
|
mark non camelCaps function
|
2018-08-13 17:26:32 +02:00 |
|
Laurent Destailleur
|
9fc5d39d07
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-08-12 20:09:36 +02:00 |
|
Laurent Destailleur
|
dc8c4402ee
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-08-12 20:09:22 +02:00 |
|
Laurent Destailleur
|
12e21b4886
|
FIX update extrafields
|
2018-08-12 16:29:26 +02:00 |
|
atm-greg
|
ad5f59822e
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into Add_supplier_product_description
|
2018-08-07 09:33:30 +02:00 |
|
atm-greg
|
fc705e8510
|
Merge branch '8.0' of github.com:Dolibarr/dolibarr into Add_supplier_product_description
|
2018-08-07 09:31:41 +02:00 |
|
atm-greg
|
a8b33a1710
|
New fields desc_supplier on product_fourn_prices
|
2018-08-06 16:26:25 +02:00 |
|
Laurent Destailleur
|
20e360e918
|
Start to introduce array fields for products
|
2018-07-15 18:22:26 +02:00 |
|
Regis Houssin
|
e8afd7e833
|
Fix: use "supplier" instead "reseller"
|
2018-07-07 08:48:26 +02:00 |
|
Regis Houssin
|
1522a5b22d
|
Fix: differentiate customer prices from supplier prices sharing
|
2018-07-07 08:43:59 +02:00 |
|
Laurent Destailleur
|
7981bd08b7
|
Fix price+sql error when adding product when no supplier price defined
|
2018-06-16 14:47:33 +02:00 |
|
Laurent Destailleur
|
910652eb6d
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/commande/card.php
htdocs/langs/en_US/admin.lang
|
2018-06-13 23:07:30 +02:00 |
|
fappels
|
a86c90fed1
|
Fix Wrong error for duplicate ref if barcode enabled but not set.
|
2018-06-12 16:38:42 +02:00 |
|
Laurent Destailleur
|
29ee5dffc4
|
Clean code
|
2018-06-04 12:55:55 +02:00 |
|
Laurent Destailleur
|
be2c49d490
|
Fix log
|
2018-06-01 17:39:07 +02:00 |
|
Frédéric FRANCE
|
8547827575
|
Merge remote-tracking branch 'upstream/develop' into multipriceqty
|
2018-05-23 17:06:02 +02:00 |
|
Frédéric FRANCE
|
efbb053e54
|
PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES
|
2018-05-23 17:05:08 +02:00 |
|
BENKE Charlene
|
8ed3b3e49c
|
Update product.class.php
|
2018-05-06 22:12:43 +02:00 |
|
BENKE Charlene
|
70c9ed960d
|
let's play with hook
|
2018-05-06 22:11:24 +02:00 |
|
Laurent Destailleur
|
546da0ceda
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/core/modules/modStock.class.php
htdocs/product/inventory/list.php
|
2018-05-05 14:40:39 +02:00 |
|
Laurent Destailleur
|
634e58b7c9
|
Look and feel v8
|
2018-05-04 18:24:00 +02:00 |
|
fappels
|
db76fd7895
|
Fix delete all product variants of a parent product
User object missing
|
2018-05-02 22:33:23 +02:00 |
|
BENKE Charlene
|
5ac0f77d0e
|
Add trigger for virtual stock
Allow to add/sustract some qty for GPAO OF running
|
2018-05-02 17:29:31 +02:00 |
|
Laurent Destailleur
|
411949a6bb
|
Optimize constructors
|
2018-04-21 15:08:46 +02:00 |
|
Laurent Destailleur
|
394b988a4e
|
FIX key in getEntity for supplier proposals
|
2018-04-21 14:41:31 +02:00 |
|
Laurent Destailleur
|
c30b0da07d
|
Clean code
|
2018-04-21 12:12:46 +02:00 |
|
Laurent Destailleur
|
eeb2580f32
|
Fix foreign key error
|
2018-04-10 22:23:21 +02:00 |
|
Laurent Destailleur
|
7108f68db9
|
Remove old deprecated hook insertExtraFields. Triggers must be used for
action on CRUD events.
|
2018-04-10 12:03:01 +02:00 |
|
Laurent Destailleur
|
ff411ed2e5
|
NEW Add accounting account number on product tooltip
|
2018-04-08 23:54:04 +02:00 |
|
Marc de Lima Lucio
|
3646374976
|
NEW: default warehouse field for products + prefill warehouses when dispatching supplier orders
|
2018-03-28 11:54:21 +02:00 |
|
Laurent Destailleur
|
72cedcf9f3
|
Removed method fetch_prods() and get_each_prod() not used, keep only
get_arbo_each_prod() that is better.
|
2018-03-22 18:01:06 +01:00 |
|
Laurent Destailleur
|
9980a5fbd0
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
|
2018-03-22 14:08:43 +01:00 |
|
Laurent Destailleur
|
700c69e127
|
NEW Can set position of images in module tickets
Mutualize code of method show_photo
|
2018-03-22 11:46:35 +01:00 |
|
fappels
|
9e4a66b1a9
|
Fix hidden oprion PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION
|
2018-03-22 10:46:54 +01:00 |
|
Laurent Destailleur
|
c962b89495
|
NEW hook getnomurltooltip is replaced with hook getNomUrl more powerfull
|
2018-03-15 20:46:55 +01:00 |
|
Laurent Destailleur
|
302fed8646
|
More fa image to replace png picto
|
2018-03-14 20:08:44 +01:00 |
|
Laurent Destailleur
|
64f21b8a3c
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/expensereport/card.php
|
2018-03-11 00:10:13 +01:00 |
|
Laurent Destailleur
|
6c9e0e1752
|
Merge branch '7.0' into 7.0
|
2018-03-10 21:52:57 +01:00 |
|
Laurent Destailleur
|
905cf112e9
|
Merge pull request #8327 from tiaris/fix7.0
FIX #8289
|
2018-03-10 18:58:22 +01:00 |
|
Laurent Destailleur
|
6fcc271790
|
Update product.class.php
|
2018-03-10 18:57:55 +01:00 |
|
BadPixxel
|
44d18027f2
|
BugFix for PHP7.1: PHP Warning: A non-numeric value encountered in /tmp/Dolibarr/htdocs/product/class/product.class.php on line 1709
|
2018-03-10 15:48:40 +01:00 |
|
jean
|
6793bfae3a
|
FIX #8289 add a cofoiguration for correct stopck calculation
|
2018-03-10 14:17:52 +01:00 |
|
Laurent Destailleur
|
cf45f78d7e
|
Merge pull request #8218 from OPEN-DSI/product_supplier_buyprice_multicurrency
NEW Add multicurrency support for product buy price for supplier propales, orders and invoices
|
2018-03-07 13:12:23 +01:00 |
|
Laurent Destailleur
|
19ae24f693
|
Code comment
|
2018-02-26 21:03:52 +01:00 |
|
KHELIFA
|
54dba24ab5
|
Add multicurrency support for product buy price for supplier propales, orders and invoices
|
2018-02-23 11:06:07 +01:00 |
|
Laurent Destailleur
|
c4130730cb
|
Clean code around fetch_optionals()
|
2018-02-20 19:38:18 +01:00 |
|
Laurent Destailleur
|
4f369bd746
|
NEW Can force usage of shared link for photo of products
|
2018-02-13 16:34:43 +01:00 |
|
Regis Houssin
|
40fe3849dc
|
Fix: avoid Warning: A non-numeric value encountered
|
2018-02-12 08:21:35 +01:00 |
|
Laurent Destailleur
|
3c3402bc60
|
Debug API for prices of products
|
2018-01-14 15:58:04 +01:00 |
|
Laurent Destailleur
|
af6b84ba3a
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/list.php
htdocs/contact/document.php
htdocs/product/list.php
|
2018-01-11 01:03:13 +01:00 |
|
Paul Dermody
|
a1ac285a25
|
Fixed automated computation of surface and volume to use correct units. It was failing for inches and feet.
|
2018-01-07 12:42:14 -06:00 |
|
Laurent Destailleur
|
2b056b0177
|
BUG Fix of old hidden feature price per quantity
|
2017-12-22 12:53:46 +01:00 |
|
Laurent Destailleur
|
f85e79e250
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/filefunc.inc.php
htdocs/holiday/class/holiday.class.php
|
2017-12-08 13:13:53 +01:00 |
|
Laurent Destailleur
|
8dc3d7323d
|
Merge pull request #7923 from fmarcet/6.0
FIX #7379: Compatibility with PRODUCT_USE_OLD_PATH_FOR_PHOTO varieable
|
2017-12-08 13:02:07 +01:00 |
|
Laurent Destailleur
|
08abb1490a
|
Remove code using not defined var
|
2017-12-08 12:54:08 +01:00 |
|
Ferran Marcet
|
bfc476a118
|
FIX #7379: Compatibility with PRODUCT_USE_OLD_PATH_FOR_PHOTO varieable
|
2017-12-07 18:44:33 +01:00 |
|
Laurent Destailleur
|
e8327fd9a1
|
Fix the eatby/sellby date was not visible.
|
2017-12-02 10:43:01 +01:00 |
|
Laurent Destailleur
|
4969ae2abb
|
Fix missing the badge on virtual product tab
|
2017-12-01 17:48:51 +01:00 |
|
Laurent Destailleur
|
a832bbb348
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/compta/facture/stats/index.php
|
2017-12-01 16:18:03 +01:00 |
|
Laurent Destailleur
|
46b015d205
|
Fix usage of option STOCK_SUPPORTS_SERVICES
|
2017-12-01 13:40:24 +01:00 |
|
root
|
b7f26ea788
|
FIX add line bad price and ref
|
2017-11-30 11:10:01 +01:00 |
|
Scrutinizer Auto-Fixer
|
aab2799981
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2017-11-27 13:48:36 +00:00 |
|
Laurent Destailleur
|
ae906270f3
|
Debug module variant
|
2017-11-26 18:43:43 +01:00 |
|
Laurent Destailleur
|
b93e35cdd2
|
Fix a lot of request to use the IN getentity instead of =
Fix a lot of request to use left join on type of payment table
|
2017-11-23 15:06:16 +01:00 |
|
Laurent Destailleur
|
405275693f
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/stock/replenishorders.php
htdocs/projet/activity/perday.php
|
2017-11-17 14:20:08 +01:00 |
|
florian HENRY
|
e195cf0b95
|
fix : return vat code for supplier price
|
2017-11-14 09:53:06 +01:00 |
|
Laurent Destailleur
|
955ed7dbbf
|
NEW Show the supplier ref into supplier cards
|
2017-11-12 15:30:21 +01:00 |
|
Alexandre SPANGARO
|
2d17e4094c
|
Merge remote-tracking branch 'uptream/develop' into 7.0-accountancyproductvariant
# Conflicts:
# htdocs/install/mysql/migration/6.0.0-7.0.0.sql
|
2017-11-03 06:18:27 +01:00 |
|
Laurent Destailleur
|
1b28c45e2c
|
PERF Links in getNomUrl use only one tag a instead of 2.
|
2017-11-02 15:19:14 +01:00 |
|
Alexandre SPANGARO
|
8d3beef161
|
Add fields in product card
|
2017-11-01 07:19:36 +01:00 |
|
Laurent Destailleur
|
202712be94
|
Work on module builder
|
2017-10-25 22:02:07 +02:00 |
|
Laurent Destailleur
|
19a5780f7f
|
Clean code
|
2017-10-20 23:49:20 +02:00 |
|
Laurent Destailleur
|
e40bffb0d5
|
Fix bug reported by scrutinizer
|
2017-10-07 20:21:47 +02:00 |
|
Laurent Destailleur
|
a501a20487
|
NEW Search filters in lists are restored when using "back to list"
|
2017-10-03 16:00:52 +02:00 |
|
Laurent Destailleur
|
934edd9f5a
|
Merge branch 'develop' into 6.0-api
|
2017-09-24 22:01:07 +02:00 |
|
Regis Houssin
|
77fea1983c
|
Fix: wrong supplier product price id
|
2017-09-20 16:57:38 +02:00 |
|
Laurent Destailleur
|
a3c555049d
|
NEW Add supplier proposals into stats of product page.
|
2017-09-17 18:08:23 +02:00 |
|
Laurent Destailleur
|
5e34b121dd
|
Add more robust php unit to detect not escaped sql. Fix not escaped sql
|
2017-09-15 15:41:07 +02:00 |
|
Laurent Destailleur
|
939d33cce7
|
Fix bug reported by scrutinizer
|
2017-09-12 19:12:39 +02:00 |
|
Laurent Destailleur
|
47d2350ad4
|
Fix bugs reported by scrutinizer
|
2017-09-12 19:03:12 +02:00 |
|
Laurent Destailleur
|
259cca0230
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/dict.php
htdocs/admin/mails_templates.php
|
2017-09-08 13:30:54 +02:00 |
|
Laurent Destailleur
|
03fe9d4e97
|
Escape all status
|
2017-09-08 13:23:12 +02:00 |
|
Laurent Destailleur
|
097b660c41
|
Mutualize code
|
2017-08-18 16:25:00 +02:00 |
|
fappels
|
78283b6a0b
|
Ignore rights filter for virtual stock calculation.
|
2017-06-30 17:02:50 +02:00 |
|
Laurent Destailleur
|
59bd4749a8
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
htdocs/core/menus/standard/eldy.lib.php
htdocs/product/class/product.class.php
|
2017-06-24 10:27:10 +02:00 |
|
Laurent Destailleur
|
1211e0d7ab
|
FIX vat code not saved during product creation.
|
2017-06-23 12:09:21 +02:00 |
|
Laurent Destailleur
|
1af74b4c42
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
dev/skeletons/skeleton_list.php
htdocs/admin/perms.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/hookmanager.class.php
htdocs/core/lib/files.lib.php
htdocs/product/class/product.class.php
htdocs/product/class/service.class.php
htdocs/product/index.php
htdocs/product/list.php
htdocs/public/members/new.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
|
2017-06-09 12:50:56 +02:00 |
|
Laurent Destailleur
|
02781b41ca
|
Fix several problem with hook printFieldListWhere
|
2017-06-09 11:02:34 +02:00 |
|
Regis Houssin
|
5c5663c5ae
|
New: getEntity function use true $shared value by default
|
2017-05-30 18:50:54 +02:00 |
|
Laurent Destailleur
|
1a8884bbbe
|
NEW Can filter on year and product tags on the product statistic page
|
2017-05-22 15:20:52 +02:00 |
|
Laurent Destailleur
|
c224e2b4f6
|
Remove table that does not exists
|
2017-05-17 16:05:26 +02:00 |
|
Laurent Destailleur
|
fa290c34fa
|
Fix against SQL injection. Add phpunit to detect missing escapement.
|
2017-05-12 16:55:11 +02:00 |
|
Laurent Destailleur
|
30cf3f2bda
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/install/mysql/tables/llx_bank_account.sql
|
2017-05-11 00:03:06 +02:00 |
|
Laurent Destailleur
|
768df56c07
|
Uniformize name of standard PDF template
|
2017-05-04 20:16:55 +02:00 |
|
Laurent Destailleur
|
3e9ccc186a
|
NEW Small PDF template for products
|
2017-04-13 10:26:12 +02:00 |
|
Laurent Destailleur
|
26a9999fbf
|
Support of preview for pdf with several pages
|
2017-04-12 11:38:55 +02:00 |
|
Laurent Destailleur
|
b054ca8267
|
NEW Introduce mass action on product list ('delete' for the moment)
|
2017-04-09 15:02:55 +02:00 |
|
Laurent Destailleur
|
ea44e14b60
|
Start debug the variant module
|
2017-04-07 11:01:12 +02:00 |
|
Laurent Destailleur
|
3adb43c6e5
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture.php
htdocs/core/boxes/box_produits.php
htdocs/core/boxes/box_produits_alerte_stock.php
htdocs/langs/en_US/bills.lang
htdocs/product/class/product.class.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
|
2017-03-23 12:52:19 +01:00 |
|
Laurent Destailleur
|
ee8112dde7
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/projet/class/project.class.php
|
2017-03-21 19:20:14 +01:00 |
|
Laurent Destailleur
|
43e70830ed
|
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
|
2017-03-21 17:18:41 +01:00 |
|
arnaud
|
a796a321cc
|
Merge branch '3.9_dalibo' of github.com:ATM-Consulting/dolibarr into NEW_odt_others_objects
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/product/admin/product.php
htdocs/product/card.php
|
2017-03-10 12:16:55 +01:00 |
|
Laurent Destailleur
|
5f79b2d0c6
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/accountancy/admin/categories.php
htdocs/expensereport/class/expensereport.class.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
|
2017-03-05 22:11:35 +01:00 |
|
Laurent Destailleur
|
f67c967d0b
|
FIX The vat rate line used when adding a predefined product was wrong if
there is several vat line with same rate.
|
2017-03-04 22:27:44 +01:00 |
|
Laurent Destailleur
|
832c91417a
|
Fix the default_vat_code was not correctly saved and shown on the
product price.
|
2017-03-04 19:16:09 +01:00 |
|
fmarcet
|
e1f459d67a
|
Fix: Error when references are numeric
|
2017-03-03 12:57:52 +01:00 |
|
Laurent Destailleur
|
58229907d4
|
Removed not used class "Service". Reduce nb of request on dashboard.
|
2017-02-28 12:35:55 +01:00 |
|
Laurent Destailleur
|
170ad1a265
|
Depreciate a class not really used
|
2017-02-27 00:56:44 +01:00 |
|
Laurent Destailleur
|
e1a6e6e4ab
|
Rename "attributes" into "variants" to avoid confusion with extrafields
|
2017-02-08 12:37:38 +01:00 |
|
Laurent Destailleur
|
b24f244f67
|
Merge pull request #5533 from marcosgdf/prod-attr
Feature Request: NEW Added product attributes feature
|
2017-02-08 11:20:33 +01:00 |
|
Laurent Destailleur
|
fcbc12ce31
|
Merge pull request #6344 from atm-ph/new_link_movement_stock_to_project
New link movement stock to project
|
2017-02-06 20:45:04 +01:00 |
|
Laurent Destailleur
|
aa1c14e508
|
Remove change of PMP when we should not
|
2017-02-06 20:43:44 +01:00 |
|
Marcos García de La Fuente
|
d06fb423c0
|
Merge branch 'develop' into prod-attr
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/langs/en_US/products.lang
|
2017-02-02 20:07:41 +01:00 |
|
BENKE Charlie
|
772d862766
|
Update product.class.php
|
2017-01-31 23:13:58 +01:00 |
|
atm-ph
|
56d75c552d
|
New movement stock can be linked to project
|
2017-01-29 13:04:06 +01:00 |
|
Gustavo Novaro
|
22a815a1b4
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2017-01-17 01:21:44 -03:00 |
|
Laurent Destailleur
|
fafe71ec52
|
Fix autocalculation of surface and volume.
|
2017-01-16 10:55:33 +01:00 |
|
Laurent Destailleur
|
1b1bab94ca
|
More complete commit for #6114
|
2017-01-16 10:43:22 +01:00 |
|
Laurent Destailleur
|
81d76f8600
|
Merge pull request #6114 from defrance/patch-52
NEW Allow to change heigth and width on product
|
2017-01-16 10:19:47 +01:00 |
|
Marcos García de La Fuente
|
d09a3628c5
|
Merge branch 'develop' into prod-attr
# Conflicts:
# htdocs/compta/facture.php
|
2017-01-14 23:59:14 +01:00 |
|
Gustavo Novaro
|
751aa2a2aa
|
Improve code style
|
2017-01-12 12:11:45 -03:00 |
|
arnaud
|
b813144edb
|
NEW generation ODT
|
2017-01-06 16:44:09 +01:00 |
|
Laurent Destailleur
|
f46ce68d08
|
NEW Can sort thumbs visible on product card
|
2016-12-31 16:16:20 +01:00 |
|
Marcos García de La Fuente
|
154425e2bc
|
Fixed PHP fatal error
|
2016-12-27 16:13:39 +01:00 |
|
Marcos García de La Fuente
|
5669f734b8
|
Merge branch 'develop' into prod-attr
# Conflicts:
# htdocs/comm/propal/card.php
# htdocs/commande/card.php
# htdocs/compta/facture.php
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
|
2016-12-24 21:39:40 +01:00 |
|
Laurent Destailleur
|
ecab7cb70e
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/product/class/product.class.php
|
2016-12-14 12:29:41 +01:00 |
|
Laurent Destailleur
|
43d18cd70c
|
FIX if a supplier price reference is changed after creating an order, we
can't clone order.
|
2016-12-13 13:22:24 +01:00 |
|
Laurent Destailleur
|
95d8faef04
|
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
Conflicts:
htdocs/product/class/product.class.php
|
2016-12-11 10:51:15 +01:00 |
|
Laurent Destailleur
|
7fd75c793a
|
FIX Regression when deleting product
|
2016-12-11 10:39:48 +01:00 |
|
Laurent Destailleur
|
9b436ce871
|
Merge remote-tracking branch 'origin/3.9' into 4.0
Conflicts:
htdocs/product/class/product.class.php
|
2016-12-11 02:51:32 +01:00 |
|
Laurent Destailleur
|
b42a2616bc
|
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
|
2016-12-11 02:34:59 +01:00 |
|
BENKE Charlie
|
b7af046147
|
Add automated compute
|
2016-12-11 01:53:33 +01:00 |
|
Maxime Kohlhaas
|
3befe1b83f
|
Fix product photo in tooltip
|
2016-12-10 23:34:32 +01:00 |
|
BENKE Charlie
|
7c7626e445
|
allow to change height and width
|
2016-12-10 13:19:33 +01:00 |
|
Maxime Kohlhaas
|
97e21cb775
|
Fix : delete product was not possible if batch stock
|
2016-12-10 13:05:46 +01:00 |
|
fappels
|
c3b43e18d1
|
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status
|
2016-12-05 18:15:08 +01:00 |
|
fappels
|
18478eaa31
|
Add warehouse status filter to load_stock function
|
2016-12-05 18:08:09 +01:00 |
|
Laurent Destailleur
|
761a795294
|
Maxi debug on REST APIs
|
2016-12-05 13:31:29 +01:00 |
|
Marcos García de La Fuente
|
cf0ee36150
|
Merge branch 'develop' into prod-attr
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
|
2016-11-27 18:10:01 +01:00 |
|
Laurent Destailleur
|
12350f180a
|
Merge pull request #5993 from fappels/develop-product-delete-batch
Fix Delete from product_batch on product delete
|
2016-11-22 19:33:07 +01:00 |
|
fappels
|
c09d09b869
|
Remove hasbatch test
Intention is to remove all data linked to product_stock, which will be
deleted.
|
2016-11-20 22:30:40 +01:00 |
|
Laurent Destailleur
|
34b42d5913
|
Merge pull request #6008 from defrance/patch-44
if supplier have multiple price return it several times
|
2016-11-19 21:08:59 +01:00 |
|
Laurent Destailleur
|
ad981a0f07
|
FIX the key for getEntity was different for same element.
|
2016-11-18 12:54:08 +01:00 |
|
BENKE Charlie
|
8a37db3f1c
|
if supplier have multiple price return it several times
|
2016-11-18 08:23:12 +01:00 |
|