lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
83,748 Commits 43 Branches 150 Tags 886 MiB
7909055ee8
Commit Graph

5154 Commits

Author SHA1 Message Date
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
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
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
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
atm-greg
ce15af0980 manage packaging on supplier prices 2019-11-23 15:52:34 +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
Frédéric FRANCE
446c66da62
use class CONST 2019-11-14 08:15:39 +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
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer
f4aaa8d9bb Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:34:37 +00:00
Scrutinizer Auto-Fixer
87585c0f2a Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 17:32:11 +00:00
Scrutinizer Auto-Fixer
c85e54b08c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-12 08:46:08 +00:00
Scrutinizer Auto-Fixer
df664e790b Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-11 23:15:34 +00:00
Laurent Destailleur
8976bd7c9b Fix setup of accounting account 2019-11-11 19:05:42 +01:00
stickler-ci
3df87a419c Fixing style errors. 2019-11-10 11:12:42 +00:00
Philippe GRAND
098ffd4827 add some comment 2019-11-10 12:12:14 +01:00
Philippe GRAND
69e1d0480a add some comment 2019-11-10 12:10:13 +01:00
Laurent Destailleur
274ddaa1be Fix mandatory field 2019-11-09 19:01:03 +01:00
Cédric
4dbf151b15
Inject $user in ProductCombination::updateProperties 2019-11-09 13:29:12 +01:00
Scrutinizer Auto-Fixer
2ecfe41810 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-08 09:53:31 +00:00
Laurent Destailleur
f11943126a Fix scrutinizer 2019-11-08 09:42:39 +01:00
Laurent Destailleur
3fcc72f504
Merge pull request #12353 from frederic34/patch-17 
can't have static and $this at same time
 2019-11-07 11:32:55 +01:00
Laurent Destailleur
9dc309d59d
Merge pull request #12351 from frederic34/patch-15 
Update fournisseurs.php
 2019-11-07 11:31:43 +01:00
Laurent Destailleur
1ea8fed9c4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-07 11:16:20 +01:00
Laurent Destailleur
feef992d39 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-07 11:16:09 +01:00
Frédéric FRANCE
90f80d137f
can't have static and $this at same time 2019-11-05 23:19:11 +01:00
Frédéric FRANCE
d1131e6b5a
Update fournisseurs.php 2019-11-05 22:27:30 +01:00
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Laurent Destailleur
d972fa8bcb Fix pb with model_pdf 2019-11-05 20:20:57 +01:00
Laurent Destailleur
94bd0f71d9 Fix pb with permission 2019-11-05 19:41:30 +01:00
Laurent Destailleur
ce1dec253f FIX #11364 2019-11-05 12:47:38 +01:00
Laurent Destailleur
0347d82660
Merge pull request #12303 from frederic34/patch-2 
css
 2019-11-04 20:31:02 +01:00
Laurent Destailleur
5d41268d1e CSS 2019-11-04 19:28:04 +01:00
Laurent Destailleur
11500fb8d9 FIX confusion between permto... and permisstionto... 2019-11-04 15:33:49 +01:00
Frédéric FRANCE
534f8712a3
Update fournisseurs.php 2019-11-02 18:11:18 +01:00