Laurent Destailleur
5633f58477
FIX #12978
2020-02-03 03:25:41 +01:00
Alexandre SPANGARO
02dbc11f98
Move Gnu.org to https
2019-09-23 21:55:30 +02:00
VESSILLER
3ea2e0c915
NEW add parent id or ref column in warehouse import
2019-09-09 15:03:20 +02:00
Laurent Destailleur
21a1e0d7b3
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/categories/index.php
htdocs/comm/action/list.php
htdocs/comm/action/rapport/index.php
htdocs/compta/paiement.php
htdocs/compta/sociales/document.php
htdocs/compta/tva/document.php
htdocs/core/actions_massactions.inc.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/facture/paiement.php
htdocs/loan/document.php
htdocs/main.inc.php
2019-06-04 19:03:27 +02:00
Laurent Destailleur
57cfb4b007
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/website/class/website.class.php
2019-06-02 12:36:07 +02:00
Laurent Destailleur
300f46cb01
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-06-02 12:30:25 +02:00
Maxime Kohlhaas
15fd24a511
Fix : remove hardcoded llx_ prefix
2019-05-31 12:14:51 +02:00
Frédéric FRANCE
e6c3eb0ba1
wip
2019-02-26 21:13:07 +01:00
Frédéric FRANCE
1c07006015
wip
2019-02-25 21:36:27 +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
Regis Houssin
359318392f
FIX missing entity filter in function "build_filterField()" (export)
2019-02-14 10:47:07 +01:00
Laurent Destailleur
a689f8dc3f
Code comment
2019-02-13 23:34:28 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing
2019-01-27 15:20:16 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
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
c2c4366c62
Removed duplicate translation
2018-10-24 11:38:16 +02:00
Laurent Destailleur
e24117e75b
Fix position of modules is string on 2 digits
2018-10-06 11:57:53 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace
2018-08-29 21:25:22 +02:00
Philippe GRAND
0d10722a7f
Docs : Update and complete
2018-07-10 14:57:23 +02:00
Frédéric FRANCE
e2a557aadd
limit length of lines to 500 chars
2018-05-27 15:04:12 +02:00
Laurent Destailleur
488c0c030e
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modProduct.class.php
2018-05-23 18:09:25 +02:00
Laurent Destailleur
3a06918b16
FIX Missing extrafields in export of stock or products
2018-05-23 18:00:27 +02:00
Laurent Destailleur
d1d8494666
FIX Missing extrafields in export
2018-05-23 17:48:18 +02:00
Laurent Destailleur
9e807c1c01
Merge pull request #8751 from wdammak/patch-7
...
Add models pdf to warehouse module
2018-05-10 11:41:03 +02:00
Laurent Destailleur
546da0ceda
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/core/modules/modStock.class.php
htdocs/product/inventory/list.php
2018-05-05 14:40:39 +02:00
wdammak
c269699679
Add model_pdf to warehouse module
2018-05-05 13:33:34 +01:00
Laurent Destailleur
f6ca1eb624
Fix permission name
2018-05-05 13:24:46 +02:00
Laurent Destailleur
d00b549f91
Remove duplicate perm
2018-03-10 12:46:45 +01:00
Laurent Destailleur
029ef534d0
Clean deprecated code (property "special" removed from mod descriptor)
2018-02-25 10:55:02 +01:00
Laurent Destailleur
63d2d38c5f
Fix export stock with lot
2017-11-24 17:47:40 +01:00
Laurent Destailleur
8659d97e97
Fix export of lot must use properties of lot from product_lot
2017-11-24 17:44:19 +01:00
Laurent Destailleur
0370368d04
Restore lost field during merge
2017-11-24 16:46:50 +01:00
Laurent Destailleur
d7f5f14f46
Merge branch 'develop' into new_export_stock_valo
2017-11-24 16:40:36 +01:00
Laurent Destailleur
438a68968f
Fix regression
2017-11-24 16:28:24 +01:00
Maxime Kohlhaas
cad2fedf70
New add pmp and cost price in product stock export
2017-11-23 18:41:48 +01:00
Laurent Destailleur
6165bcdbd0
NEW Can export list of stock movements
2017-10-20 14:52:01 +02:00
Regis Houssin
5c5663c5ae
New: getEntity function use true $shared value by default
2017-05-30 18:50:54 +02:00
Laurent Destailleur
46ff62fc87
Work on inventory module debug
2017-05-06 22:28:07 +02:00
alexis Algoud
12e91f1c1b
fix rights inventory only for MAIN_LEVEL_FEATURES = 2
2017-05-02 15:25:30 +02:00
alexis Algoud
6138d197e4
FIX major issues for inventory
...
- Move all needed declaration from coreobject to commonobject for
updateCommon, fetchCommon, deleteCommon, createCommon
- Just leave method for child object into coreobject, check later if is
useless
- debug inventory card, PHP 7.0 compatibility
- activate rights for inventory into stock module
- add inventory options into stock admin module
2017-05-02 15:19:55 +02:00
Laurent Destailleur
92b5f8d85e
Move new feature inventory into module stock.
2017-04-29 21:53:01 +02:00
Maxime Kohlhaas
5ed041c0cd
Rights should not be given by default
2016-12-11 14:11:28 +01:00
Laurent Destailleur
94dbe3da3f
Fix the info if module are provided by module or not was wrong
2016-09-30 13:02:13 +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
phf
c62a69ccc8
Merge branch 'fix_3.7_issue_2858' into develop
2016-06-04 18:54:55 +02:00
phf
3cbbdf5e20
Fix #2858
2016-06-04 18:23:22 +02:00
Laurent Destailleur
b60e90a7b7
NEW A module can add, into its import profiles, a sql request to execute
...
at end of import. This allow to update dernormalized data after import.
2016-04-11 18:08:03 +02:00
