Laurent Destailleur
c4204f95d4
FIX Missing include
2020-02-07 12:12:10 +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
80707d6a5e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-28 17:24:26 +01:00
Laurent Destailleur
3a9e238dc6
FIX Missing value of $formconfirm as parameters of hook
2020-01-28 12:00:27 +01:00
Laurent Destailleur
df478dc170
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-27 01:53:49 +01:00
Laurent Destailleur
be29795f7f
Merge pull request #12905 from laudeco/hotfix/qty_negative_stock
...
fix minimum quantity on stock movement
2020-01-26 22:09:43 +01:00
Laurent Destailleur
08d8670bb3
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/class/product.class.php
2020-01-24 20:12:27 +01:00
Laurent Destailleur
17f28189f9
Virtual stock must include Manufacturing Orders
2020-01-24 14:51:45 +01:00
Laurent Destailleur
27a0858050
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
2020-01-23 17:41:31 +01:00
Laurent Destailleur
646ccc1354
Fix error management
2020-01-23 11:52:00 +01:00
Laurent De Coninck
7ec17f17d5
FIX - API - DLC/DLUO date for stock movement
...
Instead of giving a string to the creation of a stock movement, we have
to give an integer.
This PR fixes that.
[see: X]
2020-01-23 09:41:22 +01:00
Laurent De Coninck
73ee655dde
fix minimum quantity on stock movement
...
by fixing another issue on the batch management in the API, I introduced
a bug on the stock quantity decrease.
[see: X]
2020-01-22 08:13:00 +01:00
Laurent Destailleur
92856788a3
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-20 18:39:46 +01:00
Laurent Destailleur
18f2b09fb1
Debug v11
2020-01-20 12:25:25 +01:00
Laurent Destailleur
24d439845b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
2020-01-18 20:20:25 +01:00
Laurent Destailleur
45f322cce8
Fix error management in API
2020-01-18 20:17:21 +01:00
Laurent De Coninck
d2e4b9346b
enhance the doc
2020-01-17 17:49:50 +01:00
Laurent De Coninck
5687d26f95
fixes the creation of a stock movement
...
This fixes the creation of a stock movement by supporting the DLC and
DLUO.
[see: #12883 ]
2020-01-17 17:21:14 +01:00
Scrutinizer Auto-Fixer
2386573994
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-16 01:53:00 +00:00
Laurent Destailleur
3f79c00542
Merge branch 'develop' into actioncomm_category
2020-01-15 14:21:06 +01:00
Laurent Destailleur
03a1897089
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/stocks.lang
2020-01-13 13:44:32 +01:00
Laurent Destailleur
2465d5ab47
Merge pull request #12837 from laudeco/hotfix/replenish_product
...
replenish product
2020-01-13 13:18:28 +01:00
Laurent Destailleur
bfa13e16ed
Debug MO module
2020-01-13 12:30:48 +01:00
Laurent De Coninck
67d73c5488
Fix the select of the provider for one product
2020-01-12 21:56:35 +01:00
Laurent Destailleur
124f41f863
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-09 09:10:11 +01:00
Laurent Destailleur
0802df78b5
Debug MRP
2020-01-08 17:56:02 +01:00
Laurent Destailleur
97f62c68f2
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-08 13:38:03 +01:00
Laurent Destailleur
5da952cf8a
Comment
2020-01-08 13:37:52 +01:00
Laurent Destailleur
622dc7e8d7
Debug v11
2020-01-07 22:01:55 +01:00
Laurent Destailleur
7ef3ee56bd
Fix MRP
2020-01-07 20:28:21 +01:00
Laurent Destailleur
0e496d2191
MRP
2020-01-06 02:55:09 +01:00
Frédéric FRANCE
90235d0528
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-31 13:57:40 +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
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
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
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
c269229aab
doxygen
2019-12-13 08:12:55 +01:00
Rüdiger Hahn
cc96ad03c1
Update replenish.php
2019-12-11 14:00:27 +01: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
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
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
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
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
Norbert Penel
755417e9a9
add location on combobox
...
usefull for BOM, etc
2019-11-30 23:43:22 +01:00
Frédéric FRANCE
c214dd0675
Form select_produits returns void
2019-11-28 21:23:53 +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
Frédéric FRANCE
4c4ae5b6e1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-26 08:10:40 +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
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
Laurent Destailleur
0fffdd891e
Sanitize data
2019-11-21 15:37:59 +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
Frédéric FRANCE
2e5f539b2a
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-18 17:45:52 +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
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
Frédéric FRANCE
446c66da62
use class CONST
2019-11-14 08:15:39 +01: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
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
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
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
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
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
Laurent Destailleur
6f82c212a0
Finished migration to the new architecture of extrafields
2019-11-02 17:38:19 +01:00
Laurent Destailleur
e087ac434d
Merge pull request #12283 from frederic34/socid
...
replace deprecated user->societe_id by user->socid
2019-11-02 13:34:21 +01:00
Laurent Destailleur
80fd5af32b
Merge pull request #12271 from frederic34/patch-3
...
css
2019-11-02 13:30:38 +01:00
Laurent Destailleur
58ffb73627
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-11-02 12:59:49 +01:00
Laurent Destailleur
45c77b4560
Renaming some libelle into label
2019-11-02 12:59:38 +01:00
Laurent Destailleur
25e64b0610
Merge branch 'develop' into socid
2019-11-02 12:01:06 +01:00
Laurent Destailleur
68691ddd8a
Merge pull request #12265 from grandoc/new_branch_30_10_2019
...
add comment
2019-11-02 11:49:28 +01:00
Frédéric FRANCE
77d4ca81dc
Merge remote-tracking branch 'upstream/develop' into socid
2019-11-02 09:14:15 +01:00
Laurent Destailleur
cea2c3a9f4
Look and feel v11
2019-11-01 23:58:14 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid
2019-10-31 20:46:31 +01:00
atm-josselin
5550a62afa
Fix misspelling on field of productlot
2019-10-31 11:05:45 +01:00
Frédéric FRANCE
3738fb87ed
css
2019-10-30 18:42:33 +01:00
Philippe GRAND
b029febff1
add some comment
2019-10-30 10:07:54 +01:00
Laurent Destailleur
4eedf4a113
Merge branch '10.0' of https://github.com/dolibarr/dolibarr into develop
2019-10-29 11:48:36 +01:00
Laurent Destailleur
9483e367ca
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0
...
Conflicts:
htdocs/expensereport/class/expensereport.class.php
htdocs/product/stock/replenishorders.php
2019-10-29 11:48:11 +01:00
Laurent Destailleur
149d63757f
Space
2019-10-29 11:43:56 +01:00
Laurent Destailleur
e58ecaaa64
Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
...
Conflicts:
htdocs/product/stock/replenishorders.php
2019-10-29 11:43:35 +01:00
Laurent Destailleur
2814a5c07b
Fix phpcs
2019-10-24 21:47:31 +02:00
Laurent Destailleur
6855f588b5
Use dolGetStatus
2019-10-24 16:38:06 +02:00
Juanjo Menent
7e9d6dc153
Fix With pagination it is possible that the searched product does not appear if there are many open supplier orders
2019-10-24 10:58:29 +02:00
Laurent Destailleur
da00591bba
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/product.lib.php
htdocs/expedition/card.php
htdocs/product/list.php
2019-10-23 04:04:32 +02:00
Laurent Destailleur
b88968520b
Move code of extrafields to the new architecture
2019-10-22 17:08:37 +02:00
Laurent Destailleur
6079a4d159
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/langs/en_US/main.lang
2019-10-22 15:25:31 +02:00
Laurent Destailleur
5ad7ca5620
Code more generic around setting projet on a card
2019-10-22 13:43:24 +02:00
Frédéric FRANCE
7581275316
wip
2019-10-20 11:59:21 +02:00
Laurent Destailleur
ce1b443212
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-10-18 14:26:09 +02:00
Laurent Destailleur
4d9c285126
Merge pull request #12163 from sadlig/fix-stock-movement-right
...
Fix Stock movement user's right (Fixes #11967 )
2019-10-17 17:53:17 +02:00
Gildas
132ea56a59
Fix Stock movement user's right ( Fixes #11967 )
2019-10-17 17:06:38 +02:00
Marc de Lima Lucio
d79340a632
FIX: stock replenish: fetching and freeing non existing SQL result set
2019-10-17 09:55:02 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
2019-10-16 20:00:01 +02:00
Laurent Destailleur
e07e01580d
Replace deprecated code with new one
2019-10-16 03:34:32 +02:00
Laurent Destailleur
fc90916de9
Look and feel v11
2019-10-16 03:17:53 +02:00
Laurent Destailleur
fb3d20107c
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/exports/export.php
htdocs/filefunc.inc.php
2019-10-15 03:51:57 +02:00
atm-josselin
4f10009113
Add fields definition in product batch class for extrafields compatibility
2019-10-14 15:39:38 +02:00
Laurent Destailleur
67d76787eb
Add new hidden conf VARIANT_ALLOW_STOCK_MOVEMENT_ON_VARIANT_PARENT
2019-10-12 15:29:06 +02:00
Laurent Destailleur
9871dd8770
Debug variants
2019-10-12 15:27:06 +02:00
Laurent Destailleur
43a70e5548
Clean code to use the new $extrafields->attributes array
2019-10-08 09:28:50 +02:00
Laurent Destailleur
2b66282b61
NEW Code for extrafields uses the new array $extrafields->attributes
2019-10-06 14:41:52 +02:00
Frédéric FRANCE
c5f729b945
Update list.php
2019-10-02 22:59:13 +02:00
Laurent Destailleur
24570f7165
Look and feel v11. Picto are fontawesome.
2019-10-02 18:14:41 +02:00
Alexandre SPANGARO
16c6c9ae75
Merge remote-tracking branch 'upstream/develop' into 11.0_https
2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd
Merge branch 'develop' into 11.0_https
2019-10-01 06:11:43 +02:00
Laurent Destailleur
d9e9364ddf
Close #11689 Close #11696
2019-09-30 19:00:19 +02:00
Laurent Destailleur
b28cd1bb57
Merge pull request #11972 from aspangaro/11.0_fa_icon
...
NEW Add fa_icon on load_fiche_titre
2019-09-30 15:26:28 +02:00
Alexandre SPANGARO
aec50d3ac9
NEW Add fa_icon on load_fiche_titre
2019-09-30 10:14:55 +02:00
Laurent Destailleur
6966651d51
Standardize code to use dolSqlDateFilter
2019-09-28 13:22:05 +02:00
Laurent Destailleur
6858dce344
Rename table for categorie of warehouses
2019-09-27 13:28:28 +02:00
Laurent Destailleur
a79c4608d6
Merge pull request #11934 from atm-quentin/NEW_stock_categories
...
NEW Categories/Tags are also available on warehouses
2019-09-27 12:41:28 +02:00
Abbes Bahfir
1ca531239e
fix:forgotten test condition
2019-09-24 09:40:19 +01:00
Alexandre SPANGARO
02dbc11f98
Move Gnu.org to https
2019-09-23 21:55:30 +02:00
atm-quentin
a46ed62e81
Merge branch 'NEW_stock_categories' of github.com:atm-quentin/dolibarr into NEW_stock_categories
2019-09-19 16:43:49 +02:00
atm-quentin
769ef78d8e
FIX missing comment
2019-09-19 16:43:21 +02:00
stickler-ci
774ec5a274
Fixing style errors.
2019-09-19 14:30:23 +00:00
atm-quentin
c09f2d8c4e
NEW stock categories
2019-09-19 16:21:03 +02:00
Laurent Destailleur
e8bb84e803
NEW Add status of warehouse in tooltip of a warehouse.
2019-08-26 23:54:15 +02:00
Laurent Destailleur
db6b1b6ffb
NEW Add status of warehouse in tooltip of a warehouse.
2019-08-26 23:44:20 +02:00
Laurent Destailleur
467ad3ed22
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
htdocs/product/stock/card.php
2019-08-16 21:48:46 +02:00
Laurent Destailleur
ee50c41e74
Fix phpcs
2019-08-16 17:34:23 +02:00
Laurent Destailleur
48125fd957
Fix phpcs
2019-08-16 17:32:58 +02:00
Laurent Destailleur
b36df2303b
Update movement_list.php
2019-08-15 19:26:46 +02:00
atm-greg
f8ad8d72c0
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_fk_projet_on_stock_movement
2019-08-12 15:16:43 +02:00
atm-greg
acdf13d769
add fk_projet on stock movements
2019-08-12 15:08:15 +02:00
Laurent Destailleur
0a7d70829f
Translation of some comments
2019-07-05 21:37:25 +02:00
Laurent Destailleur
fa476b4994
Properties ->libelle_incoterms were renamed into ->label_incoterms
2019-06-25 13:00:02 +02:00
Laurent Destailleur
b0c76f48e1
error management
2019-06-21 09:38:26 +02:00
Laurent Destailleur
8da5794777
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/accounting.lib.php
htdocs/product/stock/class/entrepot.class.php
2019-06-20 18:24:43 +02:00
Laurent Destailleur
e28bf71964
Fix error management of warehouse->delete
2019-06-20 18:15:14 +02:00
Laurent Destailleur
d152354022
Merge pull request #11295 from OPEN-DSI/new-warehouse-extrafield
...
NEW add extrafields in warehouses
2019-06-20 03:16:49 +02:00
ICstage
820c420ae5
FIX Missing hooks
2019-06-18 14:07:52 +02:00
Francis Appels
2ecde139f0
Fix stock mouvement does not need virtual stock.
2019-06-07 18:09:03 +02:00
Lionel VESSILLER
439eafb637
NEW add extrafields in warehouses
...
- create table
- admin extrafields
- object fecth, insert, update and delete extrafields
- card and list
2019-06-03 15:44:17 +02:00
Laurent Destailleur
5f23cf7e2a
CSS
2019-05-19 13:51:47 +02:00
Laurent Destailleur
6e69db8a1a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/product/doc/pdf_standard.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
htdocs/filefunc.inc.php
2019-05-09 12:27:14 +02:00
Laurent Destailleur
c2abedeb24
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 9.0
2019-05-08 21:43:57 +02:00
Laurent Destailleur
590b1d1e90
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
2019-05-08 18:24:50 +02:00
Laurent Destailleur
b5d8bc732d
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-05-08 18:22:11 +02:00
Laurent Destailleur
c4798c34b0
Fix autocompletion of product on stock correction
2019-05-07 00:26:31 +02:00
atm-greg
e0c3cf8360
fix project link for stock correction
2019-05-03 10:24:49 +02:00
Laurent Destailleur
091132de2f
Signatures of methods createFromClone() has been standardized. All
...
methods requires the object User as first parameter.
2019-04-25 12:11:32 +02:00
Laurent Destailleur
8fa8d7fa08
FIX Combo list was limited to 20 in stock correction
2019-04-11 16:13:44 +02:00
Laurent Destailleur
be004c16c6
FIX Combo list was limited to 20 in stock correction
2019-04-11 16:13:23 +02:00
Laurent Destailleur
d7f980fda0
NEW Add picto of deletion on mass action combo lists
2019-04-09 01:22:59 +02:00
Laurent Destailleur
7b01e76d2b
Fix doxygen
2019-04-08 16:04:15 +02:00
Laurent Destailleur
fff9b7db9d
Fix doxygen
2019-04-04 18:33:12 +02:00
Laurent Destailleur
993920628b
Fix phpcs
2019-04-03 12:33:24 +02:00
Laurent Destailleur
379f9f2d53
Fix phpcs
2019-04-02 20:36:00 +02:00
Laurent Destailleur
42fda54edf
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/card.php
htdocs/fichinter/list.php
htdocs/product/stock/replenish.php
2019-04-02 19:41:58 +02:00
Laurent Destailleur
c5348be337
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-04-02 19:35:42 +02:00
Laurent Destailleur
17a61b3232
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-04-02 19:34:49 +02:00
atm-greg
957fae1081
missing params
2019-03-28 11:07:27 +01:00
atm-greg
11343e986c
add all missing hooks on replenish
2019-03-28 10:47:32 +01:00
Laurent Destailleur
f27f65e8bf
Responsive
2019-03-25 10:09:02 +01:00
Laurent Destailleur
1075ef8cf2
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-03-21 18:25:43 +01:00
Laurent Destailleur
f7f20df323
Merge pull request #10891 from atm-greg/Add_hook_on_replenish
...
Add hook on replenish
2019-03-21 18:23:06 +01:00
Laurent Destailleur
ec15f9251d
Merge pull request #10738 from frederic34/patch-2
...
phpcs fix
2019-03-05 18:42:22 +01:00
Laurent Destailleur
db5dd7f9aa
Fix phpunit
2019-03-05 18:19:37 +01:00
Frédéric FRANCE
f283782445
change visibility
2019-03-04 19:57:46 +01:00
Laurent Destailleur
1d6028dfb0
FIX PHPUnit
2019-03-04 19:38:52 +01:00
Laurent Destailleur
27402f432a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/don/class/don.class.php
htdocs/product/stock/card.php
htdocs/theme/eldy/style.css.php
2019-03-04 16:29:16 +01:00
Laurent Destailleur
16d13b223a
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-03-03 20:43:35 +01:00
Laurent Destailleur
526bd1d02e
Fix number format
2019-03-03 17:36:43 +01:00
Frédéric FRANCE
796ea6f4ea
add visibility
2019-02-28 23:19:58 +01:00
Frédéric FRANCE
4f9e35f350
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
2019-02-28 20:48:23 +01:00
Laurent Destailleur
9967adaf09
Merge pull request #10436 from wdammak/patch-23
...
Add links and related documents for a stock movement
2019-02-27 15:50:06 +01:00
Frédéric FRANCE
6ee186096c
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
2019-02-24 23:48:51 +01:00
Frédéric FRANCE
27218b7087
wip
2019-02-24 23:32:09 +01:00
Laurent Destailleur
6b46a927f1
Merge branch 'develop' into PSR2MethodsFunctionCallSignatureSpaceBeforeOpenBracket
2019-02-24 20:53:54 +01:00
Frédéric FRANCE
894123fb06
PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket
2019-02-24 20:06:55 +01:00
Frédéric FRANCE
167a857f4c
replace html code by html5 in contact
2019-02-24 14:47:47 +01:00
Frédéric FRANCE
a1d2d3bddc
replace html code by html5
2019-02-24 11:18:55 +01:00
Frédéric FRANCE
6ee29559f9
doc comment entrepot.class.php
2019-02-23 09:44:45 +01:00
Laurent Destailleur
ec5461a4d1
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/multicurrency/class/multicurrency.class.php
2019-02-21 22:31:27 +01:00
Laurent Destailleur
6cdf5c5673
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-02-21 22:28:25 +01:00
Regis Houssin
45d05da6ed
FIX missing $ismultientitymanaged for previous/next ref
2019-02-14 16:14:19 +01:00
Laurent Destailleur
e6e18ff616
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/menus/edit.php
htdocs/product/stock/card.php
htdocs/product/stock/info.php
htdocs/product/stock/movement_list.php
2019-02-14 15:33:17 +01:00
Laurent Destailleur
89050da856
Merge
2019-02-14 15:27:31 +01:00
Laurent Destailleur
2c2052d113
Update card.php
...
Avoid regression on restrictArea
2019-02-14 15:23:34 +01:00
Laurent Destailleur
4ac086ab70
Update info.php
2019-02-14 15:23:07 +01:00
Laurent Destailleur
173d28cf5a
Update mouvement.php
...
Avoid regression on restrictArea
2019-02-14 15:22:22 +01:00
Regis Houssin
aa4c5ae839
FIX missing access security checking with multicompany
2019-02-14 10:12:15 +01:00
Laurent Destailleur
2311912d8a
Merge branch 'develop' into dev_importproduct_measuringunit
2019-02-13 16:35:46 +01:00
florian HENRY
020fa52507
travis
2019-02-13 15:30:20 +01:00
Frédéric FRANCE
fa6bc309d6
Merge branch 'develop' into fixphpcs
2019-02-13 15:24:37 +01:00
florian HENRY
5bb260d3d1
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_importproduct_measuringunit
Conflicts:
htdocs/product/stock/movement_card.php
2019-02-13 13:52:35 +01:00
florian HENRY
9caefc9483
fix travis
2019-02-13 13:50:57 +01:00
Laurent Destailleur
44fd36b15c
Fix phpcs
2019-02-13 12:39:26 +01:00
Laurent Destailleur
ced386fdca
Fix phpcs
2019-02-13 11:32:00 +01:00
Frédéric FRANCE
484acc2e00
fix phpcs
2019-02-12 20:55:55 +01:00
Laurent Destailleur
41863bb127
Merge
2019-02-12 16:42:51 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature
2019-02-10 10:45:49 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
Laurent Destailleur
57f81217ee
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/localtax/index.php
htdocs/compta/tva/index.php
2019-02-03 21:14:44 +01:00
Laurent Destailleur
4d41b1b33c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-02-03 19:45:45 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
2019-02-03 14:29:45 +01:00
Maxime Kohlhaas
bb3225809b
Fix warehouse fetch was not checking parameters. Fixes #10414
2019-02-02 18:43:25 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma
2019-01-30 18:27:35 +01:00
wdammak
7812baf8aa
Cleaning after using the movement card
2019-01-28 16:12:18 +01:00
wdammak
8546c801a5
to make it work with movement_card.php
2019-01-28 05:17:09 +01:00
wdammak
837821ebb6
Create movement_card.php
2019-01-28 05:12:20 +01:00
wdammak
49ccdb9602
Update movement_list.php
...
For it to work you have to create this script
htdocs\core\modules\stock\doc\pdf_stdmouvement.modules.php
instead
htdocs\core\modules\stock\doc\pdf_stdmovement.modules.php
this mixture of fr/en confused me and I'm sure you better control the structure to make it work properly
it tested & works but with htdocs\core\modules\stock\doc\pdf_stdmouvement.modules.php
thx
2019-01-28 05:06:02 +01:00
wdammak
aa08e32761
Add links and related documents for a stock movement
...
@eldy you can clone in movement_card.php if you prefer this structure
2019-01-28 04:48:59 +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
f30a3d59ba
Merge branch 'develop' into toomanylines
2019-01-27 17:59:13 +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
496fa9b0fb
PSR2.Files.EndFileNewline.TooMany
2019-01-27 14:10:35 +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
Philippe GRAND
621b42e8e3
update with html5 compliant code
2019-01-21 10:02:11 +01:00
Laurent Destailleur
300889f53a
# WARNING: head commit changed in the meantime
...
Fix
2019-01-19 13:22:38 +01:00
Laurent Destailleur
2bbaae88d6
Fix standardize 'createfromclone' param when cloning
2019-01-19 12:46:38 +01:00
Regis Houssin
1a15698f96
FIX replace deprecated "print_titre" with "load_fiche_titre"
...
Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>
2018-12-25 08:36:42 +01:00
Laurent Destailleur
44a6644969
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-12-18 21:55:53 +01:00
Laurent Destailleur
89068ffef1
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/adherents/subscription.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/langs/es_ES/companies.lang
htdocs/langs/es_ES/errors.lang
htdocs/product/stock/product.php
htdocs/user/card.php
2018-12-18 21:55:14 +01:00
Laurent Destailleur
af4405c669
FIX Replenishment with option STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE
2018-12-16 20:29:08 +01:00
Laurent Destailleur
d8b5cd4bdf
Remove white lines
2018-12-16 19:31:59 +01:00
Laurent Destailleur
efb88292dd
Clean code
2018-12-16 19:30:54 +01:00
Laurent Destailleur
003c463ee4
FIX Can't delete a line of minimal stock per warehouse
2018-12-16 19:23:53 +01:00
Laurent Destailleur
1bce3f6c6b
Fix phpcs
2018-12-15 14:54:10 +01:00
Laurent Destailleur
27f8096afa
Merge branch 'develop' into PR_NEW_reception
2018-12-15 12:50:31 +01:00
Laurent Destailleur
2011afe6fb
Merge branch 'develop' into actionrefused
2018-12-14 15:48:24 +01:00
Laurent Destailleur
78cdade1a7
Merge pull request #10211 from atm-john/fix_error_message_details
...
Add détails to error message
2018-12-14 14:26:38 +01:00
madx666
3159c3f8d1
Change type_mouvement on movement_list
2018-12-13 11:28:49 +01:00
ATM John BOTELLA
6a4df05fd0
fix error message details
2018-12-08 17:29:07 +01:00
BENKE Charlene
1dc2fc5060
fix #9475
2018-12-01 16:17:52 +01:00
Philippe GRAND
05d617b759
fix typo error
2018-11-26 14:33:45 +01:00
Frédéric FRANCE
731d19a29b
add tooltip to butActionRefused
2018-11-13 21:40:17 +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 Destailleur
5bbf7e8f1d
Fix look and feel v8
2018-11-08 10:21:43 +01:00
Laurent Destailleur
66ffcf287a
Fix filter on extrafields
2018-11-07 12:49:17 +01:00
Regis Houssin
9589f69574
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_email
Conflicts:
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
2018-10-30 18:29:28 +01:00
Laurent Destailleur
68f6ebd0ff
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/core/lib/security.lib.php
htdocs/modulebuilder/template/myobject_card.php
2018-10-30 14:47:39 +01:00
Maxime Kohlhaas
46d3bec104
Fix replenish wasn't caring about supplier price min quantity #9561
2018-10-28 10:25:56 +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
24f37c7bd7
CSS
2018-10-24 12:12:06 +02:00
Laurent Destailleur
36323752ed
Project must be on a dedicated field
2018-10-24 12:00:54 +02:00
Laurent Destailleur
c2c4366c62
Removed duplicate translation
2018-10-24 11:38:16 +02:00
Laurent Destailleur
6d86727c0b
Lang not loaded
2018-10-24 11:34:00 +02:00
Laurent Destailleur
1a4bb7ed12
FIX hover on line of movement list
2018-10-24 11:23:21 +02:00
Laurent Destailleur
eaab953ba2
Renamed mouvement.php into movement_list.php to follow dev rules
2018-10-24 03:50:18 +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
36ae81c749
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-10-19 14:17:20 +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
Laurent Destailleur
5a9f0cbff7
Merge pull request #9796 from frederic34/patch-21
...
do not trim int
2018-10-19 13:26:08 +02:00
Frédéric FRANCE
ebc5cb5a96
do not trim int
2018-10-17 20:24:43 +02:00
Frédéric FRANCE
393303fe31
do not trim int
2018-10-17 20:17:43 +02:00
Laurent Destailleur
57bb8bcfcd
Disabled action are hidden with reason
2018-10-16 20:27:33 +02:00
Laurent Destailleur
d43e1fcef6
Merge pull request #9729 from simnandez/develop
...
New: works with variants
2018-10-16 20:08:17 +02:00
Laurent Destailleur
97429aeb7a
Merge pull request #9721 from grandoc/new_branch_10_10_2018
...
Standardize and update code
2018-10-16 19:30:19 +02:00
Laurent Destailleur
2c1e8d6535
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/expedition/class/expeditionbatch.class.php
htdocs/public/payment/newpayment.php
htdocs/stripe/config.php
2018-10-16 18:47:11 +02:00
Juanjo Menent
e3643c7ab7
Merge remote-tracking branch 'upstream/develop' into develop
2018-10-15 11:44:50 +02:00
Maxime Kohlhaas
af813f8214
Fix missing status_batch var on product lists #9606
2018-10-14 19:55:25 +02:00
atm-ph
23e4cd57f3
Fix warnings PHP7
2018-10-12 23:27:38 +02:00
Philippe GRAND
9e494e65e0
Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018
2018-10-12 19:04:02 +02:00
Philippe GRAND
357173f0ef
Standardize and update code
2018-10-12 09:30:53 +02:00
Juanjo Menent
ab55ff2e2c
New: works with variants:
...
- Make the checkbox working correctly
2018-10-11 15:44:23 +02:00
Laurent Destailleur
e6f179b6cb
Fix look
2018-10-11 13:33:44 +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
Fernando Octavio García López
c7eb935cb8
FIX Fixed translatable field name in stock movement table
2018-10-10 22:57:08 -06:00
atm-quentin
aaace60b0d
FIX stock movement on close reception and set status if too much receive$
2018-10-10 15:33:35 +02:00
Laurent Destailleur
df0ec95b22
Code comment and better error message
2018-10-09 21:21:10 +02:00
Philippe GRAND
596dba9ce1
Standardize code
2018-10-06 12:14:47 +02:00
Philippe GRAND
b3925dd2bd
Standardize code
2018-10-05 16:04:10 +02:00
Philippe GRAND
d2ec703b51
Standardize and update code
2018-10-04 09:24:57 +02:00
atm-quentin
52717dbb65
NEW debut rename stock conf
2018-10-03 18:05:22 +02:00
Philippe GRAND
574cfad48f
Standardize and update code
2018-09-28 14:49:34 +02:00
Laurent Destailleur
62b31df069
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/rssparser.class.php
htdocs/langs/en_US/boxes.lang
2018-09-27 12:55:25 +02:00
Laurent Destailleur
575c63f87d
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/class/CMailFile.class.php
2018-09-27 12:52:10 +02:00
Laurent Destailleur
ff3f1e933a
Update replenish.php
2018-09-27 09:22:38 +02:00
gauthier
fc7c0ce521
FIX : need to filter on current entity on replenish
2018-09-24 16:23:44 +02:00
Frédéric FRANCE
6c8cbf710b
reduce complexity of ProductStockEntrepot class
2018-09-16 13:59:15 +02:00
Frédéric FRANCE
987fdbe73c
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-12 21:29:41 +02:00
Frédéric FRANCE
a558c3bdac
replace select_date
2018-09-09 11:25:59 +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
4ea582ad4a
move phpcs:ignore
2018-09-02 11:12:07 +02:00
Frédéric FRANCE
47879d44bc
move phpcs:ignore
2018-09-02 09:57:19 +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
c013f9cf3d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2018-09-01 15:13:04 +02:00
Laurent Destailleur
c2548b8b39
Merge pull request #9298 from ksar-ksar/Upd_hook_formConfirm
...
NEW hook formConfirm always called if hooked
2018-09-01 14:50:08 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-09-01 13:52:51 +02:00
Philippe GRAND
1944ef0dc3
conflict resolution
2018-09-01 12:38:22 +02:00
Philippe GRAND
3a8bde227b
Standardize and update code
2018-08-31 19:26:08 +02:00
Philippe GRAND
70ae8c6081
Standardize and update code
2018-08-31 18:27:16 +02:00
ksar-ksar
49d3bea192
Remove the test
...
After discussion with Frederic, the best solution is to remove the test
2018-08-30 11:27:48 +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
9c6ce4b29d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-28 02:36:15 +02:00
Laurent Destailleur
2db84a679e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/modulebuilder/index.php
2018-08-28 02:35:45 +02:00
Laurent Destailleur
7219bac0b2
Merge pull request #9168 from frederic34/trimtrailing
...
Trimtrailing
2018-08-28 02:30:02 +02:00
Laurent Destailleur
e00d6eda7e
Update productlot_list.php
2018-08-28 01:29:33 +02:00
Frédéric FRANCE
27978ed9a0
Update productlot_list.php
...
https://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/62492-dolibarr-8-erreur-sql-avec-le-menu-lots-series
2018-08-26 07:47:33 +02:00
ksar-ksar
a844855ade
Update hook formConfirm
...
The hook should be called when the $formconfirm is not empty
2018-08-24 16:40:26 +02:00
Philippe GRAND
87067b2bc9
Standardize and update code
2018-08-23 18:35:45 +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
Laurent Destailleur
0799970804
Merge pull request #9248 from frederic34/FunctionDeclaration
...
function declaration
2018-08-21 13:41:56 +02:00
Laurent Destailleur
85eed6cf80
Merge branch 'develop' into trimtrailing
2018-08-21 13:40:04 +02:00
Laurent Destailleur
39f7d4a011
Merge pull request #8975 from atm-greg/Add_hook_on_replenish
...
add hooks on stock replenish
2018-08-21 13:28:18 +02:00
Laurent Destailleur
0ee7befa19
Update replenish.php
2018-08-21 13:27:49 +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
Philippe GRAND
57f51fda3e
Standardize
2018-08-15 12:48:13 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function
2018-08-13 17:26:32 +02:00
Frédéric FRANCE
6f74ecceaf
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-12 18:21:59 +02:00
Frédéric FRANCE
b00164ca39
test phpcs v3
2018-08-09 11:03:50 +02:00
Frédéric FRANCE
9025c452ef
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-07 16:40:03 +02:00
Philippe GRAND
948647f3f9
comment translation
2018-08-04 14:17:51 +02:00
Frédéric FRANCE
6cb0fb10d6
trim trailing
2018-07-26 19:05:34 +02:00
Philippe GRAND
ff04cb64c0
Clean and update code
2018-07-25 15:36:50 +02:00
Laurent Destailleur
dc2fec8f57
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-24 19:37:04 +02:00
Laurent Destailleur
d871b8964f
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-07-24 19:23:40 +02:00
Laurent Destailleur
e9eb8da61b
Update replenish.php
2018-07-24 18:09:50 +02:00
gauthier
33aa373362
FIX: when stock is empty for current entity but > 0 in other entity, until this commit product wasn't displaied on replenishment, it must depends on multientity stock sharing
2018-07-16 15:27:37 +02:00
Laurent Destailleur
3eac1f410d
Merge pull request #8983 from atm-greg/Add_hook_on_replenish
...
Add hook on replenish
2018-07-16 10:02:26 +02:00
Laurent Destailleur
5f52dfa873
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-10 14:02:40 +02:00
Regis Houssin
1522a5b22d
Fix: differentiate customer prices from supplier prices sharing
2018-07-07 08:43:59 +02:00
Laurent Destailleur
f9b46ee0fa
Merge pull request #8818 from wdammak/patch-6
...
NEW Add link to inventory code
2018-06-30 01:19:50 +02:00
Philippe GRAND
a952b46d8b
clean and update code
2018-06-27 12:37:31 +02:00
Laurent Destailleur
5c93fa1bfb
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/journals_list.php
htdocs/compta/facture/fiche-rec.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/langs/fr_FR/other.lang
2018-06-26 01:25:03 +02:00
Laurent Destailleur
27a27e02a1
Fix css
2018-06-22 22:53:53 +02:00
atm-greg
df056980b5
fix bad result on fetch ProductStockEntrepot
2018-06-19 10:46:07 +02:00
atm-greg
2cdae2ec98
remove globalcard context
2018-06-18 11:30:38 +02:00
atm-greg
72449ddef4
add hooks on stock replenish
2018-06-15 16:55:23 +02:00
Laurent Destailleur
4a5fd35e11
Look and feel v8
2018-06-13 22:57:41 +02:00
fappels
e0f9605483
Fix add missing properties for trigger
2018-06-03 11:05:02 +02:00
Laurent Destailleur
0503373e31
Avoid error on screen
2018-05-31 09:49:46 +02:00
Laurent Destailleur
51b5f63ce8
Merge pull request #8880 from wdammak/patch-14
...
Add movement generateDocument function (mode dev)
2018-05-29 11:15:00 +02:00
wdammak
9ec6387a63
Add movement generateDocument function (mode dev)
2018-05-28 05:21:53 +01:00
Frédéric FRANCE
d986909109
loadlangs
2018-05-26 23:52:52 +02:00
Laurent Destailleur
cbe54e596b
Merge pull request #8817 from wdammak/patch-5
...
Add generateDocument function to entrepot class
2018-05-25 11:08:43 +02:00
Laurent Destailleur
f416f9629e
Merge pull request #8840 from all3kcis/patch-9
...
Add oldcopy on productlot::update()
2018-05-25 10:22:18 +02:00
Laurent Destailleur
b9fbf13eba
Fix look and feel v8
2018-05-25 09:36:49 +02:00
Laurent Destailleur
23e2bb20d9
Look and feel v8
2018-05-24 12:32:04 +02:00
Laurent Destailleur
e51aa68284
Fix link to warehouses for events
2018-05-24 12:16:04 +02:00
All3kcis
4bfd8b5539
Add oldcopy on productlot::update()
2018-05-23 10:38:24 +02:00
wdammak
90881fe488
Add link to inventory code
2018-05-18 16:32:46 +01:00
wdammak
5fef8c2dc1
Add generateDocument function to entrepot class
2018-05-18 14:59:42 +01:00
Laurent Destailleur
429efcc979
Merge pull request #8772 from wdammak/patch-2
...
Documents generes movement warehouse
2018-05-18 12:20:58 +02:00
wdammak
c0e5132108
Documents generes movement warehouse
2018-05-09 15:07:11 +01:00
wdammak
e62426546d
Add Documents generes
2018-05-09 15:02:46 +01:00
Laurent Destailleur
461ae46cc4
FIX When on a high page and searching for a small result, list was not
...
visible.
2018-04-24 11:37:57 +02:00
Laurent Destailleur
ac89951acd
Merge pull request #8647 from fmarcet/develop
...
New: Add same parameters on 'printFieldListTitle' hooks
2018-04-22 19:35:09 +02:00
Laurent Destailleur
69adf73f4f
Clean code from $var = True
2018-04-22 19:27:37 +02:00
Laurent Destailleur
ccd9aa8059
Fight against dolibarr warnings
2018-04-21 12:16:12 +02:00
Ferran Marcet
6ced1a3264
New: Add same parameters on 'printFieldListTitle' hooks
2018-04-20 10:38:16 +02:00
Laurent Destailleur
bbfc4a3e17
NEW Look and feel v8 - Show Picto "+" on all links "Add record"
2018-04-18 03:26:15 +02:00
Laurent Destailleur
0d0da234b1
Lowercase NULL, TRUE, FALSE according to PSR2
2018-04-16 13:51:16 +02:00
Laurent Destailleur
e2838aa074
NEW Show also size in bytes in tooltip if visible unit is not bytes
2018-04-15 17:58:13 +02:00
Laurent Destailleur
8fbde88872
Look and feel v8
2018-04-15 17:37:49 +02:00
All-3kcis
c35b454455
Fix bug productlot created without entity
2018-04-12 17:13:42 +02:00
All-3kcis
f1d1fdf951
Fix bug when entity=null on DB
2018-04-12 17:11:02 +02:00
All-3kcis
21df700325
Add option to save file with product batch ref
...
+ use batch number like ref instead of id
+ debug access to shared link
2018-04-12 15:55:08 +02:00
All-3kcis
f7e58f3c73
Add files management on products lot
2018-04-12 15:10:37 +02:00
Laurent Destailleur
68b4b74d80
Merge pull request #8531 from all3kcis/patch-7
...
Add insertExtraFields into create/update
2018-04-11 16:34:21 +02:00
Laurent Destailleur
701aa53bdd
Update productlot.class.php
2018-04-11 16:33:12 +02:00
All3kcis
00c8593567
remove hook
2018-04-11 14:09:30 +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
All3kcis
3cc3816391
Add $action before insertExtrafields hook
2018-04-10 10:17:06 +02:00
All3kcis
691e3df1c0
Add insertExtraFields in create
2018-04-10 09:59:07 +02:00
Laurent Destailleur
9d9f3ddf85
Merge pull request #8502 from ATM-Marc/NEW_create_from_list
...
NEW: generalize use of button to create new element from list
2018-04-05 16:40:15 +02:00
Regis Houssin
9f7fcdc8bf
Fix: multiple avoid Warning and errors
2018-04-02 10:18:51 +02:00
Laurent Destailleur
43f8834b28
Uniformize code with the new module builder framework
2018-03-31 18:48:27 +02:00
Marc de Lima Lucio
0366e645d5
NEW: generalize button to create object from list, for most of the lists
2018-03-30 16:54:38 +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
All3kcis
a7e33150ce
add status batch for getNomUrl
2018-03-16 14:09:38 +01:00
All3kcis
c574a74a2e
Add status batch for getNomUrl
2018-03-16 13:59:04 +01:00
Laurent Destailleur
78b0585798
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/taxes.php
2018-03-12 19:09:57 +01:00
Laurent Destailleur
55d3e72463
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/contact/class/contact.class.php
htdocs/societe/card.php
2018-03-12 19:02:30 +01:00
Laurent Destailleur
d5d6939fd9
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
2018-03-11 19:28:39 +01:00
Maxime Kohlhaas
fd36ade61a
Fix unit in replenish #7225
2018-03-10 11:20:32 +01:00
Laurent Destailleur
14d7ffa53b
Fix cancel and template to record stock movement/correction
2018-03-06 09:07:39 +01:00
Laurent Destailleur
d569adea2f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-05 21:46:40 +01:00
Laurent Destailleur
1537363e59
Fix cancel and template to record stock movement/correction
2018-03-05 21:16:01 +01:00
Laurent Destailleur
c921fde3e5
Update mouvement.php
2018-03-05 20:58:30 +01:00
Alexis ALGOUD
35002cf93d
Merge branch 'develop' into NEW_price_on_stock_mvt
2018-03-05 17:45:27 +01:00
Alexis Algoud
a84990ab78
NEW price in burger menu on mouvement list
2018-03-05 17:43:06 +01:00
Laurent Destailleur
ea5cd4db76
Merge pull request #8250 from ruistrecht-alt/Fix_bad_naming_resotre
...
FIX misspelled restore_lastsearch_values
2018-03-02 17:53:33 +01:00
Laurent Destailleur
a3350d12d8
css
2018-03-01 23:51:06 +01:00
Rui Strecht
5b925a5912
Fix misspelled restore_lastsearch_values
2018-02-27 11:08:23 +00:00
Laurent Destailleur
0cc84ab92f
FIX Missing restore_lastsearch_values
2018-02-26 21:21:28 +01:00
Laurent Destailleur
3c552cec15
FIX Missing restore_lastsearch_values
2018-02-26 21:16:40 +01:00
Laurent Destailleur
0a79550f43
Fix oldcopy must be saved before update_extras
2018-02-23 16:11:00 +01:00
Laurent Destailleur
b4446764f8
Clean code of deprecated usage
2018-02-21 14:48:25 +01:00
Laurent Destailleur
72c1357c9b
NEW Section of files generated by mass action not visible if empty
2018-02-21 11:02:45 +01:00
Laurent Destailleur
c4130730cb
Clean code around fetch_optionals()
2018-02-20 19:38:18 +01:00
Laurent Destailleur
809ef1bd00
FIX Trigger *_MODIFY must be called when editing a property event extra.
...
Clean duplicate trigggers "*_CLONE"
2018-02-20 18:09:38 +01:00
Laurent Destailleur
23494a9dd4
Update product.php
2018-01-20 12:53:30 +01:00
All-3kcis
a58a3f893d
Fix #8058
2018-01-19 10:21:48 +01:00
Laurent Destailleur
8b972313ae
Fix scrutinizer
2018-01-12 15:38:53 +01:00
Laurent Destailleur
644e8b5a05
Fix navigation on stock
2017-12-24 15:02:15 +01:00
Laurent Destailleur
f0c8b548f3
Fix bugs reported by scrutinizer
2017-12-22 14:24:31 +01:00
Laurent Destailleur
493669e986
Fix look and feel v7
2017-12-22 14:19:12 +01:00
Laurent Destailleur
eab44f62b1
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_builddoc.inc.php
htdocs/core/class/html.form.class.php
htdocs/core/tpl/admin_extrafields_add.tpl.php
htdocs/core/tpl/admin_extrafields_edit.tpl.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/core/tpl/notes.tpl.php
htdocs/main.inc.php
htdocs/product/inventory/tpl/inventory.tpl.php
htdocs/societe/tpl/linesalesrepresentative.tpl.php
2017-12-21 14:35:33 +01:00
Laurent Destailleur
6a62e13960
FIX security vulnerability reported by ADLab of Venustech
2017-12-21 13:32:16 +01:00
Laurent Destailleur
247c380d18
Several fixes
2017-12-12 16:11:40 +01:00
Laurent Destailleur
af1028576d
Fix on search all (trim search + search from smartphone).
2017-12-12 11:31:30 +01:00
Laurent Destailleur
2458244ee3
Fix css
2017-12-02 16:24:38 +01:00
Laurent Destailleur
0a6633da6e
Fix error message
2017-12-02 15:56:56 +01:00
Laurent Destailleur
fa8b913d24
Change order or field
2017-12-02 11:24:33 +01:00
Laurent Destailleur
64d29709d5
FIX #7881 error not reported/blocking when subprodut need lot
2017-12-01 18:12:29 +01:00
Laurent Destailleur
a0231b5c60
Fix responsive
2017-12-01 12:55:28 +01:00
florian HENRY
94285ae494
factorization of extrafeild into list
2017-11-27 15:24:29 +01:00
Laurent Destailleur
9f235e1ff6
Standardize database: field ref of warehouse was renamed label -> ref
2017-11-24 15:27:00 +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
Laurent Destailleur
a6e4e4ddb0
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/product/stock/replenishorders.php
2017-11-17 14:17:49 +01:00
Laurent Destailleur
fde33594a2
FIX #7824
2017-11-17 14:06:08 +01:00
Laurent Destailleur
7f28c9fff6
FIX #7824
...
Conflicts:
htdocs/product/stock/replenishorders.php
2017-11-17 14:01:21 +01:00
Laurent Destailleur
57a6ada2a3
FIX #7824
2017-11-17 13:57:40 +01:00
Laurent Destailleur
25a2e6f577
FIX #7824
2017-11-17 13:56:41 +01:00
Laurent Destailleur
f68b2bdeca
Use the confirmation when deleting from mass action everywhere.
2017-11-15 11:39:11 +01:00
Laurent Destailleur
836f6bf3c9
Fix search filter when using extrafields 'links'
2017-11-12 12:39:23 +01:00
Laurent Destailleur
d1860b87f8
NEW Add a confirmation for all mass action 'delete'
2017-11-11 16:34:11 +01:00
Laurent Destailleur
d569218162
Fix 'separate' extrafields must be visible by default.
...
Sandardize name of list pages (must end with _list.php)
2017-10-29 11:23:20 +01:00
Laurent Destailleur
f24204c79a
Error management after extrafield update
2017-10-24 19:04:40 +02:00
Laurent Destailleur
c6e5115d34
Set default limit to 100 on all rest api that list
2017-10-22 15:42:19 +02:00
Laurent Destailleur
19a5780f7f
Clean code
2017-10-20 23:49:20 +02:00
Laurent Destailleur
7f85d73001
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/contrat/card.php
htdocs/expensereport/card.php
htdocs/fichinter/list.php
htdocs/fourn/commande/card.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/card.php
htdocs/fourn/paiement/card.php
htdocs/livraison/card.php
htdocs/modulebuilder/template/myobject_list.php
htdocs/societe/rib.php
htdocs/supplier_proposal/list.php
htdocs/user/card.php
2017-10-18 19:51:29 +02:00
Laurent Destailleur
8626d6279a
Fix perm to delete files
2017-10-18 17:21:30 +02:00
Scrutinizer Auto-Fixer
165741517e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-13 11:28:26 +00:00
Laurent Destailleur
8c5cf9ea45
Fix date output
2017-10-12 18:04:47 +02:00
Laurent Destailleur
8e0da9bfeb
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/holiday/document.php
2017-10-04 13:32:53 +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
f007f9e7e5
NEW Add new property visible dy default on lists on extrafields
2017-09-29 13:26:44 +02:00
arnaud
7f807986d7
FIX replenish if line test GETPOST on line 0
2017-09-27 10:53:29 +02:00
Laurent Destailleur
051ca6fdc4
Merge pull request #7162 from hguibourgdev/patch-5
...
NEW Can show stock in alert even if alter is set to 0
2017-09-25 18:17:18 +02:00
Laurent Destailleur
934edd9f5a
Merge branch 'develop' into 6.0-api
2017-09-24 22:01:07 +02:00
Laurent Destailleur
8773a6860f
Fix HTML5 use of <br> is preferred to <br />
2017-09-15 23:49:04 +02:00
Laurent Destailleur
f5d2283093
USe second parameter in GETPOST
2017-09-15 10:52:53 +02:00
Laurent Destailleur
0873260b8a
USe second parameter in GETPOST
2017-09-15 10:50:50 +02:00
Laurent Destailleur
8f5206accf
NEW The lot of a product uses the link and picto when shown into list.
2017-09-15 10:45:41 +02:00
fappels
681c2a67bd
Fix batch required for lot product error message.
2017-09-11 23:22:44 +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
bde293af22
Fix filter on extrafield with type sellist
2017-09-07 15:34:25 +02:00
Laurent Destailleur
fa752348c8
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/various_payment/index.php
htdocs/contact/list.php
htdocs/langs/en_US/errors.lang
2017-08-02 17:56:09 +02:00
Laurent Destailleur
c8b79214cd
Fix translation
2017-08-02 14:53:42 +02:00
Laurent Destailleur
025ecd4ecc
Fix default value for inventory code during a stock correction
2017-08-02 14:21:20 +02:00
Laurent Destailleur
5b1f5b0f20
Fix translation done twice into field title of array
2017-08-02 13:31:53 +02:00
Laurent Destailleur
5bf10737d9
Merge branch 'develop' into patch-14
2017-07-25 18:32:36 +02:00
hguibourgdev
6b9d25708b
NEW : Add toolkit for StockLimit
2017-07-24 21:05:21 +02:00
hguibourgdev
3825e7fd52
Update replenish.php
...
FIX ">=" instead of ">" for alert test in order to work when negatif stock are allowed
2017-07-15 18:55:52 +02:00
Laurent Destailleur
2870798d07
Fix remove warnings
2017-07-13 00:35:10 +02:00
fappels
78283b6a0b
Ignore rights filter for virtual stock calculation.
2017-06-30 17:02:50 +02:00
Laurent Destailleur
adf281c4f3
Look and feel v6
2017-06-27 17:42:07 +02:00
Laurent Destailleur
c213624c14
Fix migration into product_lot
2017-06-27 16:42:37 +02:00
Laurent Destailleur
4102403482
Look and feel v6
2017-06-21 11:37:34 +02:00
Laurent Destailleur
bb2d27280b
Fix sort link must be disabled for computed field
2017-06-19 14:31:08 +02:00
Laurent Destailleur
ba3a74576c
Merge 5.0
2017-06-12 18:22:51 +02:00
Laurent Destailleur
64a6ff9687
Fix test for navigation disabling for external users
2017-06-12 16:26:25 +02:00
Laurent Destailleur
e93cefbbf0
FIX #6985
2017-06-11 10:37:58 +02:00
Laurent Destailleur
7c0de18ac1
Fix code comment
2017-06-10 12:56:28 +02:00
Laurent Destailleur
b441c62e1d
Fix syntax error
2017-06-08 14:55:12 +02:00
Laurent Destailleur
b1f93ccb0c
Fix security
2017-06-08 14:33:46 +02:00
Laurent Destailleur
7587a3d592
Merge branch 'develop' into develop_transverse
2017-06-08 10:25:04 +02:00
Regis Houssin
b183c6e7ac
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_transverse
2017-06-07 20:23:24 +02:00
Regis Houssin
2b36135641
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
2017-06-07 20:14:03 +02:00
Laurent Destailleur
1820649175
Maxi debug of v6
2017-06-07 19:28:31 +02:00
Regis Houssin
bfd6116e5b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc
2017-06-06 15:03:36 +02:00
Regis Houssin
03df365eea
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_transverse
2017-06-06 11:01:42 +02:00
Laurent Destailleur
02b5d9e6f7
FIX #6945
2017-06-06 10:53:53 +02:00
Regis Houssin
b66da3d148
New: big refactorization of multicompany transverse mode
2017-06-06 10:23:33 +02:00
Regis Houssin
2df33d1df3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
2017-06-03 11:45:15 +02:00
Laurent Destailleur
48a6e9e038
Removed not used files
2017-05-30 22:31:57 +02:00
Regis Houssin
5c5663c5ae
New: getEntity function use true $shared value by default
2017-05-30 18:50:54 +02:00
Laurent Destailleur
f5e29d6c86
Fix phpcs warning
2017-05-22 10:45:02 +02:00
Laurent Destailleur
b3dc73e611
Look and feel v6
2017-05-21 02:43:51 +02:00
Laurent Destailleur
7dbe3b1da9
Merge pull request #6843 from aspangaro/6.0-multijournal
...
Fix : Sql error on salaries index for accountancy multijournal + debug
2017-05-18 17:45:21 +02:00
Laurent Destailleur
f3838ee8f2
Fix limit into message
2017-05-17 18:52:01 +02:00
Laurent Destailleur
68e333879f
Fix var not sanitized
2017-05-16 13:27:32 +02:00
Alexandre SPANGARO
4dc7d5cd8d
Fix : tooltip on bank in customer invoice card
2017-05-14 21:20:35 +02:00
Laurent Destailleur
5e54567558
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/skeletons/skeleton_list.php
2017-05-10 13:30:35 +02:00
Laurent Destailleur
3e0fcf5ec2
Fix label "total for this page" on last page.
2017-05-10 11:57:59 +02:00
Laurent Destailleur
e5c898e0d6
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
build/makepack-dolibarr.pl
htdocs/fichinter/list.php
htdocs/product/list.php
htdocs/projet/tasks/list.php
2017-05-10 00:48:27 +02:00
Laurent Destailleur
6d01bd712d
FIX Better sanitizing of search all parameter.
2017-05-09 19:36:10 +02:00
Laurent Destailleur
846204bdb4
Replace usage of $bc[$var] with class="oddeven"
2017-04-14 13:02:29 +02:00
Laurent Destailleur
39ebaec064
Replace usage of $bc[$var] with class="oddeven"
2017-04-14 11:22:48 +02:00
Laurent Destailleur
be439f6252
Work on look and feel v6
2017-04-07 16:16:44 +02:00
Laurent Destailleur
f598bf8bef
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-04-06 21:59:11 +02:00
Laurent Destailleur
18fc5bec9b
Better log
2017-04-06 10:56:37 +02:00
Laurent Destailleur
d99b0461c7
Extrafields multilanguage support.
2017-04-03 10:56:28 +02:00
Laurent Destailleur
979bcd3a9b
NEW Can add a background image on login page
2017-03-31 11:40:31 +02:00
Laurent Destailleur
8e70c4a0b7
Work on 6.0 new look and feel
2017-03-30 15:39:50 +02:00
Laurent Destailleur
219bcb0d54
Work on 6.0 features.
2017-03-27 22:44:50 +02:00
Laurent Destailleur
696100b9e7
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-11 12:45:57 +01:00
Laurent Destailleur
f06126c463
Fix style
2017-03-11 12:45:18 +01:00
Laurent Destailleur
d1fe6a408c
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-11 12:41:47 +01:00
Laurent Destailleur
910859145f
Fix filter on lot was lost
2017-03-11 12:40:47 +01:00
Laurent Destailleur
4e6ee4d12c
Fix dol_banner on card for lot
2017-03-11 12:37:18 +01:00
Laurent Destailleur
53238c2b0d
Fix sort order and number of lines
2017-03-11 12:27:42 +01:00
Laurent Destailleur
4ca634b41c
Better look and feel
2017-03-11 12:04:28 +01:00
Laurent Destailleur
c72e7c1057
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
2017-03-10 14:54:35 +01:00
Laurent Destailleur
4b63834868
Merge pull request #6488 from atm-quentin/develop
...
NEW filter checkbox to add draft order in replenish
2017-03-10 11:54:44 +01:00
Laurent Destailleur
184d52525a
PHP code to manage pair/impair is replaced by native CSS.
2017-03-07 22:45:22 +01:00
Quentin Vial-Gouteyron
bf8d510541
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2017-03-06 15:52:59 +01:00
Quentin Vial-Gouteyron
b378279440
New_filter_to_add_draft_order_to_validated_one
2017-03-06 15:50:17 +01:00
Laurent Destailleur
c260325863
Lang not loaded
2017-03-06 12:32:07 +01:00
Laurent Destailleur
f291e1c470
Fix test on qty for stock move
2017-03-06 12:30:59 +01:00
BENKE Charlie
29cb5dd545
FIX input stock value not display
...
the good array is "value" (like in the card tabs who give the right value)
2017-03-03 11:48:04 +01:00
Laurent Destailleur
0f11a42fe4
Fight against useless colspan
2017-02-28 19:03:39 +01:00
Laurent Destailleur
19e60f03b9
Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms
2017-02-21 14:17:44 +01:00
Laurent Destailleur
31c3398b7f
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/modules.php
2017-02-08 10:59:05 +01:00
Laurent Destailleur
c6e0a4cc87
Fix column label
2017-02-07 12:39:45 +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
c3fb559d3b
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modProduct.class.php
2017-02-01 20:58:17 +01:00
Laurent Destailleur
924a08a078
Fix code should use 5.0 framework
2017-02-01 16:24:40 +01:00
atm-ph
8e9a9637a0
Fix travis
2017-01-30 21:52:52 +01:00
atm-ph
ccad6d6dde
New show on project "overview" tab the informations about movements stock
2017-01-29 13:36:33 +01:00
atm-ph
56d75c552d
New movement stock can be linked to project
2017-01-29 13:04:06 +01:00
Laurent Destailleur
39151d7a74
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-22 12:14:18 +01:00
Laurent Destailleur
65f7de8f64
Fix css and look 5.0
2017-01-22 12:13:32 +01:00
Laurent Destailleur
4ecd657f34
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-16 00:02:43 +01:00
Laurent Destailleur
d14e4dbaba
Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on
2017-01-15 20:49:20 +01:00
Laurent Destailleur
6aa26e0f62
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/paiement.php
htdocs/product/stock/massstockmove.php
htdocs/projet/info.php
htdocs/projet/tasks/time.php
htdocs/societe/class/societe.class.php
2017-01-13 16:49:18 +01:00
Laurent Destailleur
380b61a0e9
FIX Can make a stock transfert on product not on sale/purchase.
2017-01-12 21:56:50 +01:00
Laurent Destailleur
2c6672d17a
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/tpl/login.tpl.php
2017-01-12 11:32:51 +01:00
florian HENRY
2c2bb366bd
fix : warehouse creation failed with mysql 5.7 (string 'NULL' instead of
...
"NULL")
2017-01-11 09:19:07 +01:00
Laurent Destailleur
febd23fe41
Clean dead code
2017-01-03 11:22:03 +01:00
florian HENRY
30b4d9e2e5
fix : avoid bug when batch number is not trimmed
2016-12-23 12:10:55 +01:00
Laurent Destailleur
9e44eb0d15
Fix return code REST similar for all api with POST
2016-12-23 02:08:22 +01:00
aspangaro
31fcf9aff9
Fix warehouse presentation
2016-12-10 22:13:06 +01:00
Laurent Destailleur
ce41c84c95
Fix td class
2016-12-10 16:00:33 +01:00
Laurent Destailleur
d23604701c
Fix responsive
2016-12-07 15:00:20 +01:00
fappels
bbbc768fa7
Change filter parameter to string with comma seperated values
...
Change warehousefilter from int to string with comma seperated values
for selectWarehouses and select_produits form functions.
2016-12-06 20:07:19 +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
3ca9664595
Filter stock on warehouse status for replenishment
...
Do not show stock of closed warehouse
2016-12-05 18:14:42 +01:00
Laurent Destailleur
761a795294
Maxi debug on REST APIs
2016-12-05 13:31:29 +01:00
fappels
fbdc0c25e3
Add STATUS_OPEN_INTERNAL to stock change/move pages
2016-12-05 11:42:03 +01:00
fappels
c911f906c8
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status
2016-12-05 11:36:20 +01:00
Laurent Destailleur
f3bf5f82f8
FIX Minor fix on stock rounding for float qty before output on screen.
2016-12-05 11:18:54 +01:00
fappels
a7a20f45a1
Remove Only shipping and dispatch status
...
Remove Only shipping and dispatch status, better to create new future
option 'Routing' for this.
2016-12-02 11:03:21 +01:00
Laurent Destailleur
bd8f923cee
Several fixes in filter on lists
2016-11-29 22:52:16 +01:00
Laurent Destailleur
663f7938f8
Fxi responsive design
2016-11-27 20:02:57 +01:00
Laurent Destailleur
2c9edd4205
Maxi debug on list. Fix responsive design.
2016-11-27 13:49:46 +01:00
Laurent Destailleur
e4a8342aef
Fix div-table-form balance on all lists (solve responsive design)
2016-11-27 11:41:10 +01:00
Laurent Destailleur
e6fb118155
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2016-11-26 15:52:17 +01:00
Laurent Destailleur
b63ad019ce
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2016-11-26 15:49:11 +01:00
Laurent Destailleur
e539842c28
Fix eatdate and selldate not correctly set.
2016-11-26 15:46:41 +01:00
Laurent Destailleur
16ce156631
Fix responsive design
2016-11-25 18:32:52 +01:00
Laurent Destailleur
da92be1a9f
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fichinter/card.php
htdocs/fourn/facture/card.php
2016-11-22 20:55:57 +01:00
Laurent Destailleur
cbd85f7b82
FIX #5958 no discount on supplier command made by replenishment
2016-11-22 20:50:13 +01:00
Scrutinizer Auto-Fixer
2a62564768
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-11-22 18:16:17 +00:00
Laurent Destailleur
e6a027911d
Merge pull request #5997 from fappels/develop-fix-modify-warehouse
...
Fix #5994 unable to update warehouse
2016-11-19 20:58:54 +01:00
Laurent Destailleur
dd27a52a85
Fix several problems on new REST API on project/tasks
2016-11-19 16:08:27 +01:00
Laurent Destailleur
7ac96da0d4
Several fix in warehouse stock change (rounding, api rest)
2016-11-18 16:34:03 +01:00
Laurent Destailleur
9b66f8c320
Complete REST services
2016-11-18 13:12:44 +01:00
Laurent Destailleur
ad981a0f07
FIX the key for getEntity was different for same element.
2016-11-18 12:54:08 +01:00
fappels
ed8edfceaf
code intend
2016-11-15 20:01:16 +01:00
fappels
eeb62ea2b8
Fix update entrepot
...
fix int for fk_parent
clean parenthesis
fix clean parameter country_id
2016-11-15 19:56:58 +01:00
Laurent Destailleur
ecbe719f23
FIX Several problems into shipment management with lot enabled
2016-11-14 13:40:41 +01:00
Laurent Destailleur
ab269bd7a6
Better responsive
2016-11-11 01:15:41 +01:00
Laurent Destailleur
03b882d095
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/list.php
2016-10-29 19:12:58 +02:00
Laurent Destailleur
7c75d98f9a
FIX #5866
2016-10-29 18:43:12 +02:00
Laurent Destailleur
cc43732c56
Responsive enhancements
2016-10-29 17:02:48 +02:00
Laurent Destailleur
32b6660f63
Uniformize code
2016-10-29 16:18:39 +02:00
Laurent Destailleur
f1ec2c04ed
Uniformize code
2016-10-28 18:40:26 +02:00
Laurent Destailleur
d866ef66c3
Fix label in title
2016-10-28 17:48:30 +02:00
Laurent Destailleur
220d81b350
Fix duplicate tooltips
2016-10-28 17:43:29 +02:00
Laurent Destailleur
223047cdf5
Uniformize look and feel on stock movement
2016-10-28 16:05:33 +02:00
Laurent Destailleur
6938b05219
Mutualize code to show files generated for mass actions
2016-10-28 12:00:30 +02:00
Laurent Destailleur
384abd8462
Uniformize look and feel
2016-10-25 02:56:46 +02:00
Laurent Destailleur
aad4380689
Uniformise code
2016-10-24 20:52:21 +02:00
gauthier
59941f9980
FIX : must not get full path with recursive query
2016-10-20 14:29:51 +02:00
gauthier
9a3d4031c5
FIX : param $protection - Deep counter to avoid infinite loop
2016-10-20 13:30:47 +02:00
gauthier
d85dd69184
NEW : get_full_arbo() & get_children_warehouses() functions documentation
2016-10-20 13:14:28 +02:00
gauthier
012be8e400
NEW : security check to avoid adding a parent warehouse chich is already a child of current one
2016-10-14 12:42:42 +02:00
gauthier
1a648cfc89
NEW : getNomUrl displays full path to warehouse
...
# Conflicts:
# htdocs/product/stock/class/entrepot.class.php
2016-10-14 11:53:04 +02:00
gauthier
fe1bcb7e0a
NEW : function to display full path to current warehouse
2016-10-14 11:39:46 +02:00
gauthier
416311a7b9
NEW : allow to save a parent warehouse
...
# Conflicts:
# htdocs/product/stock/card.php
2016-10-14 11:29:14 +02:00
Laurent Destailleur
92dc385307
Merge pull request #5838 from atm-gauthier/develop_NEW_filter_by_supplier_on_replenishment_card
...
Develop new filter by supplier on replenishment card
2016-10-11 20:04:02 +02:00
Laurent Destailleur
710e12420f
Use correct picto for lot
2016-10-10 02:01:30 +02:00
gauthier
fee0a88d27
Merge branch 'NEW_filter_by_supplier_on_replenishment_card' of github.com:atm-gauthier/dolibarr into develop_NEW_filter_by_supplier_on_replenishment_card
2016-10-07 09:25:18 +02:00
gauthier
18496f9159
FIX : params order
2016-10-07 09:19:10 +02:00
gauthier
ee014681b0
Merge branch 'NEW_filter_by_supplier_on_replenishment_card' of github.com:atm-gauthier/dolibarr into develop_NEW_filter_by_supplier_on_replenishment_card
2016-10-05 15:30:23 +02:00
gauthier
9c8ecdc8d8
NEW : filter by supplier on replenish.php
2016-10-05 15:06:30 +02:00
florian HENRY
d3146234b8
FIX : New add limit stock product by warehouse #5764 for PgSQL
2016-10-04 09:23:13 +02:00
Laurent Destailleur
b412baa880
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-29 10:49:47 +02:00
Laurent Destailleur
c3f5962058
Normalize code
2016-09-28 18:14:44 +02:00
fappels
acbd00286c
Fix stock decrement of lot qty on delivery
2016-09-26 17:31:55 +02:00
atm-quentin
4d828499ac
Update entrepot.class.php
2016-09-26 14:41:30 +02:00
Quentin Vial-Gouteyron
bf0556bdf1
NEW Trigger on delete stock
2016-09-26 10:47:54 +02:00
Laurent Destailleur
ea09eb13da
Uniformize code
2016-09-26 00:10:29 +02:00
Laurent Destailleur
8fa8bc7d34
Rename table for a better understanding
2016-09-22 11:39:43 +02:00
gauthier
2556e59ccf
NEW : auto delete product_stock_entrepot elements when we drop a product or a warehouse
2016-09-21 16:21:23 +02:00
gauthier
b95b84a665
FIX : doc comment for parameter $fk_product
2016-09-20 15:31:55 +02:00
gauthier
dc15eb079a
FIX : keep params when we search or skip to another page
2016-09-20 14:38:05 +02:00
gauthier
d508d44fef
NEW : migration script from 4.0.0 to 5.0.0 and langs
2016-09-20 12:10:25 +02:00
gauthier
a0ec91cb94
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_add_limit_stock_product_by_warehouse
2016-09-20 12:03:55 +02:00
gauthier
a698e40c45
NEW : filter fk_warehouse on replenishment card
2016-09-20 11:55:38 +02:00
gauthier
43e77d23e9
NEW : Delete product stock warehouse
2016-09-19 17:40:59 +02:00
gauthier
a4d0eed503
NEW : Save product stock warehouse in database and display list
2016-09-19 17:33:29 +02:00
Laurent Destailleur
4f842fd2cb
Uniformize look and feel
2016-09-19 13:57:50 +02:00
Laurent Destailleur
d1c4f02bf7
Uniformize code and style
2016-09-18 14:41:17 +02:00
Laurent Destailleur
407d9e6904
Merge pull request #5741 from atm-quentin/new_hook_stock_product_develop_dolibarr
...
NEW Hook on stock product card
2016-09-17 18:04:39 +02:00
gauthier
7a0577ccfc
NEW : add limit stock product by warehouse
2016-09-16 17:09:38 +02:00
Quentin Vial-Gouteyron
6d304f4a23
NEW Hook formObjectOptions
2016-09-13 14:56:57 +02:00
Quentin Vial-Gouteyron
f8912267cb
NEW Hook on stock product card
2016-09-13 11:56:39 +02:00
Laurent Destailleur
5c1127fc54
NEW Enhance function setValueFrom so we can use it for "edit in form"
...
feature.
2016-09-12 20:00:47 +02:00
Laurent Destailleur
5ea9fc7467
NEW Support extrafields on product lot.
2016-09-12 17:27:44 +02:00
Laurent Destailleur
9ff1809f85
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contrat/list.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/card.php
htdocs/product/stock/class/productlot.class.php
htdocs/theme/eldy/style.css.php
2016-09-12 02:05:38 +02:00
Laurent Destailleur
1fbf233f95
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/contact/list.php
htdocs/contrat/list.php
htdocs/expedition/list.php
htdocs/expensereport/list.php
htdocs/fichinter/list.php
htdocs/fourn/commande/list.php
htdocs/product/reassort.php
htdocs/product/reassortlot.php
htdocs/product/stock/list.php
htdocs/societe/list.php
htdocs/supplier_proposal/list.php
htdocs/theme/eldy/style.css.php
2016-09-12 01:50:38 +02:00
Laurent Destailleur
4ea5068966
FIX Clean of search fields
2016-09-12 00:15:27 +02:00
Ferran Marcet
4777faf49b
Fix: Search all is lost on lists when pagination or when the columns are sorted
2016-09-09 14:02:27 +02:00
Ferran Marcet
b5db70342b
Fix: Search all is lost on lists when pagination or when the columns are sorted
2016-09-09 13:58:41 +02:00
Laurent Destailleur
72e149e1a6
FIX SEC Improve CSRF protection. Reduce usage of NOCSRFCHECK.
2016-09-08 12:12:00 +02:00
fappels
6574ebcbff
Replace non existing ref parameter
...
Replace non existing ref parameter with product_id and batch to fetch a
specific batch from a product.
Remove unused sceleton methods.
2016-09-07 12:40:15 +02:00
Laurent Destailleur
b107b0644f
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-02 22:07:17 +02:00
Laurent Destailleur
8c4324d912
FIX #5674
2016-09-02 21:15:48 +02:00
fappels
1c626c01ee
Ignore time when checking lot dates
2016-09-02 11:29:28 +02:00
Laurent Destailleur
fac28f9589
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/sociales/charges.php
htdocs/core/boxes/modules_boxes.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
2016-08-28 02:40:20 +02:00
Laurent Destailleur
88afc4ad5a
Merge pull request #5625 from aspangaro/4.0-p42
...
Uniformize presentation, add button cancel everywhere
2016-08-17 16:11:59 +02:00
Laurent Destailleur
58fc64982f
Merge pull request #5618 from fappels/4.0_fix_eatby_sellby_check
...
Fix sellby without hour check
2016-08-17 16:10:09 +02:00
aspangaro
b7420372b7
Uniformize presentation, add button cancel everywhere
2016-08-12 22:53:30 +02:00
fappels
f9a9d4d2d8
Fix sellby without hour check
2016-08-11 20:59:56 +02:00
aspangaro
9a0fed93d1
Merge remote-tracking branch 'Upstream/4.0' into 4.0-p37
2016-08-10 07:42:04 +02:00
aspangaro
a1d1396919
Uniformize presentation
2016-08-10 07:40:40 +02:00
Laurent Destailleur
29fdebe0d9
Fix list of lot
2016-08-09 13:21:30 +02:00
Laurent Destailleur
7b6755cfcd
Fix several errors in search an sorting in stock by lot view
2016-08-09 13:14:33 +02:00
Laurent Destailleur
7667dc735e
Fix several errors in search an sorting in stock by lot view
2016-08-09 13:11:56 +02:00
Laurent Destailleur
7c7bcac3c4
Fix lost filter
2016-08-08 22:00:01 +02:00
Laurent Destailleur
4b13a11d9c
Key must be first field
2016-08-08 20:46:08 +02:00
Laurent Destailleur
437b796928
Fix search on product ref
2016-08-08 20:34:55 +02:00
Laurent Destailleur
2133b1c3b5
NEW Table with list of lots/serial can be viewed (module product batch).
2016-08-08 20:31:03 +02:00
Laurent Destailleur
bcd055b378
Move button to link to, in same part of code than code to output links.
2016-08-05 15:30:28 +02:00
Laurent Destailleur
7a7e7b330f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-08-04 11:58:11 +02:00
Laurent Destailleur
7f6e2a277a
NEW Link between objects can be done on both side and on all objects
2016-08-04 11:57:37 +02:00
florian HENRY
5f415478ac
FIX : update limit stock on product stock
2016-08-03 17:29:04 +02:00
Laurent Destailleur
f0c75388cb
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/api_commande.class.php
htdocs/compta/facture/class/api_invoice.class.php
htdocs/product/class/api_product.class.php
htdocs/societe/class/api_contact.class.php
htdocs/societe/class/api_thirdparty.class.php
2016-08-02 17:43:12 +02:00
Laurent Destailleur
54df49aebe
Fix strict sql
2016-08-02 13:36:16 +02:00
BENKE Charlie
66d0d09769
Add : additionnal origin of mouvement
...
Main problem is the difference between folder and the class of project
Maybe one time (for a major version of dolibarr (5, 6 ...) we start to standadisation of all modules
2016-07-23 16:30:12 +02:00
Laurent Destailleur
af09528738
NEW Add substitution key __DATE_YMD__, __DATE_DUE_YMD__, __AMOUNT__ and
...
__AMOUNT_WO_TAX__ into emails templates.
2016-07-21 20:45:30 +02:00
Laurent Destailleur
f90946dbde
Fix test on eat and sell date
2016-07-21 19:12:05 +02:00
Laurent Destailleur
80d99651a4
Merge remote-tracking branch 'origin/3.9' into 4.0
...
Conflicts:
htdocs/product/stock/tpl/stockcorrection.tpl.php
2016-07-21 18:49:10 +02:00
Laurent Destailleur
3a08a14d56
Merge remote-tracking branch 'origin/3.8' into 3.9
2016-07-21 18:45:53 +02:00
Laurent Destailleur
80354cd8d6
FIX Can correct stock of lot using eatby or sell by date
2016-07-21 18:43:44 +02:00
Laurent Destailleur
2d037eb34e
FIX Direction of movement lost if an error occurs
2016-07-21 18:36:43 +02:00
Laurent Destailleur
441a8c4a74
FIX Can make a movement on "out of sell" products
2016-07-21 18:28:06 +02:00
Laurent Destailleur
b5334b47bd
Code comment. Add missing translation keyword
2016-07-21 16:22:43 +02:00
All3kcis
7a549b1c32
Update entrepot.class.php
...
Add trim on "libelle" in create function of entrepot
2016-07-20 16:57:26 +02:00
Laurent Destailleur
97b03e225b
NEW Add option "Stock can be negative". Off by default.
2016-07-15 19:57:35 +02:00
Laurent Destailleur
1195e3bf0c
FIX Direction of movement lost if an error occurs
2016-07-15 19:35:00 +02:00
Laurent Destailleur
7263b29cb4
Merge pull request #5301 from atm-ph/fix_develop_issue_2858
...
NEW issue 2858 - Option to allow negative transfer
2016-07-15 18:15:20 +02:00
Laurent Destailleur
e557502504
Fix save of stock limit failed
2016-07-01 17:34:49 +02:00
phf
8c133d8546
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_develop_issue_2858
...
Conflicts:
htdocs/core/class/ldap.class.php
2016-06-30 17:09:22 +02:00
Laurent Destailleur
8187dc2006
Fix css
2016-06-19 16:07:34 +02:00
Laurent Destailleur
f94d140d2a
Fix bad sql field name
2016-06-16 13:00:23 +02:00
Laurent Destailleur
5b5b7a2bf9
FIX Bad value used for task warning delay
...
FIX Compatibility datee and date_end for warning of tasks
2016-06-15 14:05:48 +02:00
Laurent Destailleur
8b446faa53
Fix field not sortable
2016-06-08 11:59:48 +02:00
Laurent Destailleur
653387ba95
Fix pagination on movement list
2016-06-08 11:58:37 +02:00
Laurent Destailleur
73d465a8e8
Fix missing use of natural_search
2016-06-08 11:44:00 +02:00
Laurent Destailleur
59c6c90200
Remove a FIXME.
2016-06-08 11:40:50 +02:00
Laurent Destailleur
240c4baba8
FIX filter on stock movement
2016-06-08 11:29:48 +02:00
Laurent Destailleur
f5d7c6fda5
Fix translation of desired stock (this is more clear)
2016-06-08 09:57:03 +02:00
Laurent Destailleur
5db6bcd4a8
Fix contextpage lost on submitting form or sorting
2016-06-07 14:06:00 +02:00
phf
67392fbac5
Fix move the code into mouvementstock class
2016-06-07 12:27:43 +02:00
phf
c62a69ccc8
Merge branch 'fix_3.7_issue_2858' into develop
2016-06-04 18:54:55 +02:00
paolo
ff95bb1644
fix #4467
2016-06-04 18:31:31 +02:00
phf
3cbbdf5e20
Fix #2858
2016-06-04 18:23:22 +02:00
Juanjo Menent
99a28a9dcd
Fix Travis error introduced in commit '236ecf01'
2016-06-03 16:15:27 +02:00
Laurent Destailleur
5106f40a56
Merge branch 'develop_NEW_decrease_stock_expedition_classify' of
...
https://github.com/atm-alexis/dolibarr into
atm-alexis-develop_NEW_decrease_stock_expedition_classify
Conflicts:
htdocs/expedition/class/expedition.class.php
2016-06-02 11:23:49 +02:00
Laurent Destailleur
40005b8f65
FIX Missing search on barcode, only if defined
2016-06-01 12:15:54 +02:00
Laurent Destailleur
7063b26018
Debug 4.0
2016-05-17 19:32:19 +02:00
Laurent Destailleur
79be93d998
FIX The table llx_product_lot is now filled/used to store eatby/sellby
...
dates.
2016-05-17 18:19:36 +02:00
Laurent Destailleur
3b99fb01ee
Fix duplicate table
2016-05-17 10:51:03 +02:00
Laurent Destailleur
f9ded46a99
Start debug 4.0
2016-05-17 02:41:06 +02:00
Laurent Destailleur
901c7c9517
Link "Backtolist" was missing on products
2016-05-17 02:16:28 +02:00
Laurent Destailleur
95ea20eb44
Clean code for stock movement when lot are used. We should not get
...
duplicate records into llx_product_batch
2016-05-17 01:10:11 +02:00
Laurent Destailleur
20a2e9394d
Fix typo comment
2016-05-16 22:44:11 +02:00
Alexis Algoud
8d0e5479a0
Rename var
2016-05-14 19:22:27 +02:00
Alexis Algoud
e74e70287f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_decrease_stock_expedition_classify
...
Conflicts:
htdocs/expedition/class/expedition.class.php
htdocs/product/stock/replenish.php
2016-05-14 19:14:39 +02:00