Laurent Destailleur
3ea9c297ea
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2020-03-30 19:46:23 +02:00
Laurent Destailleur
0b7b97ec34
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-30 19:43:03 +02:00
Laurent Destailleur
efaea37d61
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
2020-03-30 19:42:53 +02:00
Laurent Destailleur
1c7ce31207
Merge pull request #13435 from ptibogxiv/patch-316
...
FIX product get purchase prices
2020-03-30 19:20:32 +02:00
Laurent Destailleur
81b41c932f
Merge pull request #13432 from atm-quentin/FIX_reapro_11
...
FIX replenish stock to buy
2020-03-30 19:11:34 +02:00
Laurent Destailleur
45a237e31b
Merge pull request #13421 from atm-quentin/NEW_hook_product_load_stats
...
NEW hook on product load stats
2020-03-30 18:54:31 +02:00
atm-quentin
9a92545d8d
FIX missing default accountancy product buy code
2020-03-30 14:28:22 +02:00
Cédric
eead9a93d3
Fix can set desiredstock to (int) 0 from API Rest
...
When you set desiredstock to 0 as an integer from the API, it registers to null in the database. Using is_numeric() fixes this.
2020-03-30 13:03:13 +02:00
Laurent Destailleur
5fad4c8cb4
CSS
2020-03-29 19:41:01 +02:00
ptibogxiv
cb7342d4c8
FIX product purchase prices
...
Fix get datas but don't fix cleandata :( @eldy
2020-03-27 20:07:18 +01:00
Laurent Destailleur
4207d94f53
FIX Bad position of total in column
...
Conflicts:
htdocs/fourn/facture/paiement.php
2020-03-27 19:10:01 +01:00
Laurent Destailleur
a4797634d5
FIX Bad position of total in column
2020-03-27 19:08:39 +01:00
Laurent Destailleur
c27592bad2
Clean deprecated params on all fetch_optionals()
2020-03-27 16:02:58 +01:00
Laurent Destailleur
f512e0d161
Fix popup
2020-03-27 12:06:58 +01:00
Laurent Destailleur
975f061b43
Fix popup
2020-03-27 12:06:18 +01:00
Laurent Destailleur
3a9cc532d7
FIX Use getNomURL instead of hard coded link. Fix limit.
2020-03-27 11:56:59 +01:00
Laurent Destailleur
4f83eb59cd
FIX Use getNomURL instead of hard coded link. Fix limit.
2020-03-27 11:55:33 +01:00
atm-quentin
96481c3d52
FIX ordered stock already in $stock
2020-03-27 09:43:59 +01:00
Bahfir Abbes
f7ecc9d60c
Fix:The column "print $langs->trans("StockCorrection");" is now duplicated.
2020-03-26 15:22:24 +01:00
atm-quentin
cef65a3c8f
FIX hook name and useless inithook
2020-03-26 09:20:14 +01:00
Laurent Destailleur
20fad86520
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/cashcontrol/cashcontrol_card.php
2020-03-26 00:14:06 +01:00
Laurent Destailleur
51f8c5ca87
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/class/commoninvoice.class.php
htdocs/expensereport/list.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/product/fournisseurs.php
2020-03-25 19:01:56 +01:00
atm-quentin
e9ee78ab8f
NEW hook on product load stats
2020-03-25 11:20:54 +01:00
Alexandre SPANGARO
5528e9ef38
Work on split module fournisseur
2020-03-24 22:02:58 +01:00
Laurent Destailleur
a5379c7144
FIX All forms must use newToken()
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/cashcontrol/cashcontrol_card.php
htdocs/supplier_proposal/card.php
2020-03-24 13:14:23 +01:00
Laurent Destailleur
1ff15e1fd9
FIX All forms must use newToken()
2020-03-24 13:10:35 +01:00
Laurent Destailleur
c2f0cdc0f6
Look and feel v12. Several minor fixes
2020-03-23 19:35:14 +01:00
Scrutinizer Auto-Fixer
e8083e2a65
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-23 14:54:02 +00:00
Regis Houssin
45579b0986
FIX remove unused var, $usercancreate can be change by Multicompany
2020-03-23 07:01:23 +01:00
Laurent Destailleur
ef86311639
Merge pull request #13224 from mapiolca/patch-38
...
# Fix Compatibility with NOTMODIFYOTHERENTITYFOURNPRICE const.
2020-03-22 20:32:15 +01:00
Laurent Destailleur
23e06debb7
Popup is smaller
2020-03-22 11:52:02 +01:00
Bahfir Abbes
c9bdefbbe0
fix: delete redundant test+fix condition test+display units type if products in warehouse of same nature
2020-03-20 19:08:24 +01:00
Laurent Destailleur
222556b464
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/accounting-files.php
htdocs/core/lib/functions.lib.php
2020-03-19 22:09:17 +01:00
Laurent Destailleur
c71da5d013
FIX mass action on stock movements
2020-03-19 15:43:06 +01:00
stickler-ci
1bff748c94
Fixing style errors.
2020-03-18 00:24:40 +00:00
Anthony Berton
82058f3a78
add phone
2020-03-18 01:17:54 +01:00
Anthony Berton
9fa4f245cc
Update list.php
2020-03-18 00:03:26 +01:00
Pierre Ardoin
26f6f04486
forgot ";"
2020-03-17 10:08:18 +01:00
Pierre Ardoin
564f412957
correction due to comments @hregis and @eldy
2020-03-17 10:04:43 +01:00
Laurent Destailleur
4f442905b2
A new way to navigate between pages in list is available
2020-03-17 03:31:58 +01:00
stickler-ci
1f83e5ac54
Fixing style errors.
2020-03-15 21:30:46 +00:00
bahfir abbes
0ad68c180d
fix:Show units of products in stocks and hide total units if content is of diffents units
2020-03-15 22:26:23 +01:00
Laurent Destailleur
3b72005f93
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/card.php
htdocs/filefunc.inc.php
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/cashdesk.lang
htdocs/langs/fr_FR/errors.lang
htdocs/langs/fr_FR/products.lang
htdocs/langs/fr_FR/projects.lang
2020-03-14 00:22:11 +01:00
Laurent Destailleur
33c5db9cc3
Prepare code for the new pagination possibility
2020-03-13 13:07:11 +01:00
Laurent Destailleur
94589158c0
Move class from external project as internal class (project is dead)
2020-03-13 02:32:33 +01:00
Scrutinizer Auto-Fixer
f413ce6aac
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-12 11:45:44 +00:00
Laurent Destailleur
f38134e44d
Fix non transversable var
2020-03-12 12:42:34 +01:00
Laurent Destailleur
dfe947885c
FIX params of setEventMessage($langs->trans('ErrorProductClone')...
2020-03-12 12:40:28 +01:00
Laurent Destailleur
31865d7ae5
Fix doc
2020-03-12 12:39:21 +01:00
Laurent Destailleur
89a8531140
Merge pull request #13237 from aspangaro/12.0_a18
...
NEW: Accountancy - Add mode intra & export for product or service bought
2020-03-11 17:08:49 +01:00
Laurent Destailleur
47ebc2bbf2
Hide legend
2020-03-06 09:52:51 +01:00
Laurent Destailleur
0bd2740779
NEW Can force position of legend of graph on right (instead of top)
2020-03-05 17:23:19 +01:00
Laurent Destailleur
ddb26d7a8f
NEW Add graph type 'piesemicircle'
2020-03-05 16:30:55 +01:00
Laurent Destailleur
fc31680bd0
Several fix for chart.js graphs
2020-03-05 02:55:06 +01:00
Laurent Destailleur
aa1552dbc0
Enhance graphs
2020-03-05 00:17:16 +01:00
Laurent Destailleur
55093f9ff2
Merge pull request #13232 from TobiasSekan/NewCategoriesInStocks
...
NEW Category filter for warehouse list
2020-03-02 22:50:08 +01:00
Laurent Destailleur
46bf65704a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-02 21:59:56 +01:00
Laurent Destailleur
87fe2e691b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/product/stats/facture.php
htdocs/product/stats/facture_fournisseur.php
2020-03-02 21:59:34 +01:00
Sekan, Tobias
754058b990
Fix lint errors
2020-03-01 14:50:22 +01:00
Sekan, Tobias
0e55495c3e
adress feedback
2020-03-01 14:45:51 +01:00
Alexandre SPANGARO
da99c89c26
FIX: typo on ckeck method
2020-03-01 05:21:51 +01:00
Alexandre SPANGARO
6982997de5
Fix error
2020-03-01 05:09:57 +01:00
Alexandre SPANGARO
d9b9913e8a
NEW: Accountancy - Add mode intra & export for product or service bought
2020-03-01 04:52:12 +01:00
Laurent Destailleur
8879672122
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-29 12:52:18 +01:00
VESSILLER
8eff3162a9
FIX undefined function measuringUnitString in product list
2020-02-29 12:47:48 +01:00
Laurent Destailleur
dea8525a6c
NEW X-Axis on graph are show vertical when there is a lot of values.
2020-02-29 01:26:24 +01:00
Laurent Destailleur
56704e4029
Add stats of products in MO
2020-02-28 19:26:52 +01:00
Tobias Sekan
0e7e6f44e2
Update list.php
2020-02-28 16:16:05 +01:00
Laurent Destailleur
bfb9739ae8
Fix manufacuring efficiency on bom lines.
2020-02-28 16:12:42 +01:00
Tobias Sekan
bc8c709900
Add category filter for stocks
2020-02-28 16:03:35 +01:00
Pierre Ardoin
8476477137
add const NOTMODIFYOTHERENTITYFOURNPRICE
...
if const NOTMODIFYOTHERENTITYFOURNPRICE, can't modify other shared fourn prices.
2020-02-27 09:19:39 +01:00
Laurent Destailleur
0646b1a7a9
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/ihm.php
2020-02-26 17:04:14 +01:00
Laurent Destailleur
ef9fe73d96
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/index.php
2020-02-26 17:02:23 +01:00
Laurent Destailleur
85a4c4cf17
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-26 16:54:08 +01:00
Laurent Destailleur
25157649e2
Fix missing column
2020-02-26 16:53:58 +01:00
Laurent Destailleur
a17fba8321
Merge pull request #13158 from bb2a/patch-18
...
Default warehouse to create order
2020-02-26 16:45:25 +01:00
Tobias Sekan
0622024f61
Fix column selection on stocklist
2020-02-26 14:37:36 +01:00
atm-josselin
b2a488ef9f
FIX : Bad translation for productlot EatBy and SellBy
2020-02-24 11:00:55 +01:00
Laurent Destailleur
f931b92d36
Merge branch 'new-takepos-batch-decrement' of
...
https://github.com/OPEN-DSI/dolibarr into develop
# Conflicts:
# htdocs/langs/en_US/errors.lang
2020-02-23 22:49:03 +01:00
futurehousestore
16b4e680f7
Add Products/Services by popularity in Orders
2020-02-22 02:45:58 +00:00
Laurent Destailleur
badc4327c2
Merge branch 'develop' into patch-3
2020-02-21 19:45:33 +01:00
Laurent Destailleur
c2677c0231
Update api_products.class.php
2020-02-21 19:44:02 +01:00
Laurent Destailleur
58a57a0411
Merge branch 'develop' into fix-modoristomouv
2020-02-21 18:05:13 +01:00
Scrutinizer Auto-Fixer
e44865d8b5
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-21 16:53:37 +00:00
VESSILLER
71c9b94b22
NEW add const CASHDESK_FORCE_DECREASE_STOCK to force batch decrementation
2020-02-21 11:08:34 +01:00
Anthony Berton
bbb108133f
Update html.formproduct.class.php
2020-02-20 22:45:03 +01:00
Laurent Destailleur
1f4b639ba0
Debug MRP module
2020-02-20 17:44:03 +01:00
DEMAREST Maxime
4630525973
Fix: Mouvementstock::get_origin modulenme whith origintype
2020-02-20 16:19:28 +01:00
Laurent Destailleur
44eda2d4ad
Fix doxygen
2020-02-20 13:42:43 +01:00
Laurent Destailleur
f1d16d6961
Merge pull request #13138 from indelog/indelog-dev
...
NEW: Allow custom module class origine type in Mouvementstock
2020-02-19 00:53:04 +01:00
Laurent Destailleur
ce3e977fc3
Merge pull request #13141 from Dolibarr/scrutinizer-patch-5
...
Scrutinizer Auto-Fixes
2020-02-18 23:49:10 +01:00
Laurent Destailleur
9b522d105e
Merge pull request #13112 from josemariagomezroncero/patch-3
...
FIX Correction bug dynamic price
2020-02-18 23:48:53 +01:00
Scrutinizer Auto-Fixer
fd48877dc6
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-18 22:47:25 +00:00
Laurent Destailleur
2ac064059a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/projet/element.php
2020-02-18 22:40:43 +01:00
Laurent Destailleur
fa16063875
Fix bad accounting code set
2020-02-18 22:39:01 +01:00
Laurent Destailleur
31ae0bc06e
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/fourn/commande/index.php
htdocs/product/card.php
2020-02-18 22:38:30 +01:00
DEMAREST Maxime
30ef5f54dd
Allow custom module class origine type in Mouvementstock
2020-02-18 18:24:54 +01:00
Laurent Destailleur
a6b0fec90b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/exports/class/export.class.php
2020-02-17 12:35:34 +01:00
Laurent Destailleur
504a67daee
FIX duplicate class name into some log lines
2020-02-17 12:34:00 +01:00
Laurent Destailleur
549bf076d7
Fix prefix of log
2020-02-17 12:22:52 +01:00
gauthier
523d09536c
FIX : must be == and not =
2020-02-17 12:20:19 +01:00
Laurent Destailleur
f4f3efec62
Fight against $_POST
2020-02-16 19:33:58 +01:00
josemariagomezroncero
601cd3809c
Correction
2020-02-14 20:16:10 +01:00
josemariagomezroncero
27a874a6ba
Correction bug dynamic price
...
It
does not allow to continue when then the product hasnt supplier pirce
2020-02-14 11:38:51 +01:00
Laurent Destailleur
525219836a
Merge pull request #13097 from josemariagomezroncero/patch-2
...
Hook for dynamic price
2020-02-13 18:54:22 +01:00
josemariagomezroncero
0d49211dea
Correction for Hook for dynamic price
...
Correction for Hook for dynamic price
2020-02-13 12:59:59 +01:00
Laurent Destailleur
9e165a782f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-13 11:58:23 +01:00
Laurent Destailleur
78d4978d31
FIX #13100
2020-02-13 11:26:11 +01:00
Laurent Destailleur
a4f13194c3
Merge pull request #12503 from atm-greg/New_Supplier_Packaging
...
NEW Experiment supplier packaging with option PRODUCT_USE_SUPPLIER_PACKAGING: Using price according to the minimum quantity
2020-02-13 10:50:56 +01:00
Laurent Destailleur
0d366c45e5
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-12 21:43:44 +01:00
Laurent Destailleur
6be746e219
Fix replenishment for virtual stock check if module is on or off
2020-02-12 21:42:48 +01:00
josemariagomezroncero
373a5ff508
Hook for dynamic price
...
Hook for dynamic price
2020-02-12 21:31:45 +01:00
Laurent Destailleur
7931734ecb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modUser.class.php
2020-02-12 20:30:20 +01:00
Laurent Destailleur
83b5fe3c71
FIX #13077 Replace left join with inner join (left join was useless)
2020-02-12 20:24:58 +01:00
Laurent Destailleur
3f4c787c84
Fix physical stock were truncated in product/reassort page
2020-02-12 20:22:53 +01:00
ptibogxiv
558ccdd8b9
Update card.php
2020-02-11 20:20:34 +01:00
ptibogxiv
5459e4b821
Fix netmeasure update and display
...
nb: netmeasure is for real weight, volume or piece;
i'll try to introduce in v12 price by unit using this value ( needed for some business ie fruits, vegetables....)
2020-02-11 20:11:37 +01:00
Laurent Destailleur
d2bafe3052
Add tab with stock movements
2020-02-11 18:18:04 +01:00
Laurent Destailleur
74d3912763
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.facture.class.php
2020-02-11 16:52:58 +01:00
Laurent Destailleur
ee7aa14247
Fix color of status
2020-02-10 21:28:49 +01:00
Laurent Destailleur
cab228ebbe
Fix condition
2020-02-10 15:54:46 +01:00
Laurent Destailleur
bb40dbe1c3
Fix label of field
2020-02-10 15:53:28 +01:00
BENKE Charlene
40ac2d5cbd
Add finished field on list
2020-02-10 14:34:00 +01:00
Laurent Destailleur
2eae9a2fa2
FIX Missing include
2020-02-07 12:15:20 +01:00
Laurent Destailleur
c4204f95d4
FIX Missing include
2020-02-07 12:12:10 +01:00
stickler-ci
102595f6b1
Fixing style errors.
2020-02-06 09:02:15 +00:00
atm-greg
f8ffdea5ae
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_Supplier_Packaging
2020-02-06 09:59:42 +01:00
VESSILLER
c3cf9e62b3
FIX links in products/services index
2020-02-05 11:31:02 +01:00
Laurent Destailleur
ffa847bc8e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-02 19:32:37 +01:00
Laurent Destailleur
d530c7f708
Try fix for #12984
2020-01-31 18:57:07 +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
540713510e
Fix load of segment prices not required for virtual stock change
...
virtual stock must include production (WIP)
2020-01-23 21:03:15 +01:00
Laurent Destailleur
12b4909c45
Fix load of segment prices not required for virtual stock change
...
virtual stock must include production (WIP)
2020-01-23 20:59:18 +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 Destailleur
57569604b2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-22 14:11:53 +01:00
Laurent Destailleur
d3411a79ef
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-22 14:11:44 +01:00
Laurent Destailleur
4686be34d2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
htdocs/product/class/product.class.php
htdocs/stripe/charge.php
2020-01-22 14:10:46 +01:00
Laurent Destailleur
839f1b83fd
Merge pull request #12901 from OPEN-DSI/new-product-list-units-columns
...
NEW columns units in product list
2020-01-22 13:55:50 +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
7e08dc17af
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-21 20:51:22 +01:00
Laurent Destailleur
fd02ed4317
Fix label
2020-01-21 20:50:58 +01:00
VESSILLER
c91ab621b8
FIX length, width and height coherence in product table
2020-01-21 17:49:27 +01:00
VESSILLER
8a348d533b
NEW only show units columns in product list (not in service list)
2020-01-21 17:29:45 +01:00
VESSILLER
70122411eb
FIX label Volume in comment
2020-01-21 11:02:14 +01:00
VESSILLER
0278cef2d7
NEW columns units in product list
2020-01-21 10:33:27 +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
969da828fa
Debug inventory
2020-01-20 02:30:53 +01:00
Laurent Destailleur
206cfcd7fe
Clean code for inventory
2020-01-20 02:07:47 +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 Destailleur
a1b03e094c
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-01-18 19:53:58 +01:00
Laurent Destailleur
df26bab65b
FIX #12881
2020-01-18 19:52:59 +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
Laurent Destailleur
0ebed529e1
FIX #12872
2020-01-17 15:27:43 +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
VESSILLER
53ddbc1eb5
FIX remove repeated sql fields in product list
2020-01-15 16:24:04 +01:00
Laurent Destailleur
3f79c00542
Merge branch 'develop' into actioncomm_category
2020-01-15 14:21:06 +01:00
Laurent Destailleur
373420edc0
Merge pull request #12476 from ptibogxiv/patch-280
...
NEW add total of value in product stat
2020-01-15 14:11:01 +01:00
Laurent Destailleur
ad7da80353
Merge pull request #12479 from OPEN-DSI/new-product-list-units
...
NEW add units in product list
2020-01-15 14:09:50 +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
b47db086cb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/inventory/class/inventory.class.php
htdocs/product/inventory/list.php
2020-01-10 14:30:42 +01:00
Laurent Destailleur
d97a59ac4a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
ChangeLog
htdocs/comm/remise.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/product/list.php
htdocs/variants/combinations.php
2020-01-10 14:25:26 +01:00
Laurent Destailleur
c4d62e0ea3
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/product/list.php
2020-01-10 13:51:29 +01:00
Laurent Destailleur
dd930fe791
Can disable a not expected behaviour on price propagation
2020-01-10 01:07:58 +01:00
Laurent Destailleur
78dcf91f02
Fix bad link
2020-01-09 22:42:31 +01:00
Laurent Destailleur
f48c7d2ecf
Fix modulebuilder
2020-01-09 22:31:23 +01:00
Laurent Destailleur
0e58edd896
Fix modulebuilder
2020-01-09 22:27:24 +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
Dev2a
2d67c2365f
Fix Check right for service for arrayofmassaction
...
if product module disable, threre is no action for service
2020-01-07 18:59:58 +01:00
Laurent Destailleur
0e496d2191
MRP
2020-01-06 02:55:09 +01:00
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
Cédric
7b295bf738
addPurchasePrice Update the price if already exist
2019-12-01 14:56:39 +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
stickler-ci
1bad6f5c9c
Fixing style errors.
2019-11-30 22:38:05 +00:00
Cédric
565a17dc47
API New add purchase prices
2019-11-30 23:36:23 +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
stickler-ci
76c5a08242
Fixing style errors.
2019-11-28 12:13:36 +00:00
Cédric
45bf3e4df9
Merge branch 'develop' into patch-3
2019-11-28 13:11:52 +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
Cédric
6484ba10c5
remove unecessary code
...
already done by ::createProductCombination
2019-11-23 16:08:35 +01:00
atm-greg
ce15af0980
manage packaging on supplier prices
2019-11-23 15:52:34 +01:00
Cédric
76fd794559
API New can customize reference when addvariant
2019-11-23 14:04:00 +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
Frédéric FRANCE
4a564cc05d
Update product.class.php
2019-11-02 18:10:01 +01:00
Laurent Destailleur
6f82c212a0
Finished migration to the new architecture of extrafields
2019-11-02 17:38:19 +01:00
Laurent Destailleur
496f93911f
Merge pull request #11821 from Tim-Otte/develop
...
NEW Extrafields support in product supplier prices
2019-11-02 16:19:13 +01:00
Laurent Destailleur
8485747713
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-11-02 13:37:43 +01:00
Laurent Destailleur
9e69b12847
FIX #12281
2019-11-02 13:37:30 +01:00
Laurent Destailleur
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
7fae6d60a7
Merge pull request #12270 from frederic34/patch-2
...
css
2019-11-02 13:09:38 +01:00
Laurent Destailleur
d232b7a387
Merge pull request #12286 from grandoc/new_branch_01_11_2019
...
add some comment
2019-11-02 13:00:23 +01:00
Laurent Destailleur
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
c12e66e2a2
Merge branch 'develop' into new_branch_01_11_2019
2019-11-02 12:00:04 +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
Laurent Destailleur
41a3861465
Merge pull request #12290 from ptibogxiv/patch-273
...
FIX prices by customer API
2019-11-02 11:47:32 +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
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid
2019-11-01 21:39:20 +01:00
stickler-ci
0e260c859b
Fixing style errors.
2019-11-01 19:28:39 +00:00
ptibogxiv
6f77885686
Update api_products.class.php
2019-11-01 20:26:39 +01:00
stickler-ci
bc5e6c867f
Fixing style errors.
2019-11-01 14:37:21 +00:00
ptibogxiv
0f80ba5353
FIX prices by customer API
2019-11-01 15:36:48 +01:00
Laurent Destailleur
e3b5be7475
All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed
...
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
2019-11-01 12:52:03 +01:00
Philippe GRAND
07cd656a1c
add some comment
2019-11-01 10:56:46 +01:00
Laurent Destailleur
68a4ddceed
Look and feel v11
2019-10-31 23:29:17 +01:00
Frédéric FRANCE
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
Frédéric FRANCE
bfe683d031
css
2019-10-30 18:40:07 +01:00
Philippe GRAND
b029febff1
add some comment
2019-10-30 10:07:54 +01:00
Laurent Destailleur
19f97fb23b
Merge pull request #12211 from frederic34/patch-2
...
doxygen product.class.php
2019-10-30 03:16:22 +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
8d21144521
Beautify select of products in vendor record
2019-10-24 20:33:16 +02:00
Laurent Destailleur
443ca85f43
NEW Beautify the select of warehouses
2019-10-24 19:48:25 +02:00
Laurent Destailleur
31452dad42
NEW Beautify the select of warehouses
2019-10-24 19:34:28 +02:00
Laurent Destailleur
6855f588b5
Use dolGetStatus
2019-10-24 16:38:06 +02:00
Frédéric FRANCE
5999d8a05a
Update product.class.php
2019-10-24 16:11:05 +02:00
Frédéric FRANCE
93a8b1d2a3
Update product.class.php
2019-10-24 16:09:35 +02:00
Laurent Destailleur
1ea3865f0d
Look and feel v11
2019-10-24 13:01:03 +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
2e573fd794
Fix save of units
...
Conflicts:
htdocs/expedition/card.php
htdocs/product/card.php
htdocs/product/class/product.class.php
2019-10-23 03:03:55 +02:00
Laurent Destailleur
f0355b3057
Debug option PRODUCT_ADD_NET_MEASURE
2019-10-23 02:58:39 +02:00
Laurent Destailleur
2f0b791cfe
Merge pull request #12202 from atm-gauthier/10.0_fix_search_on_product_and_service
...
FIX : if we search something with global search, and after with form …
2019-10-22 20:06:10 +02:00
Laurent Destailleur
c4be61c55c
FIX Better compatible fix for the trouble of weight / size units
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/product/card.php
2019-10-22 18:42:59 +02:00
Laurent Destailleur
e7e9898e0d
FIX Better compatible fix for the trouble of weight / size units
2019-10-22 18:36:36 +02:00
Laurent Destailleur
b88968520b
Move code of extrafields to the new architecture
2019-10-22 17:08:37 +02:00
gauthier
44ced0cbeb
FIX : if we search something with global search, and after with form fields, we want to stay on Products AND Services list
2019-10-22 16:11:59 +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
Tim Otte
ceb3482204
Requested changes implemented
2019-10-22 11:36:28 +02:00
Laurent Destailleur
e261d63295
NEW Can add a button "Create" after combo of object with modulebuilder.
2019-10-21 14:44:39 +02:00
Laurent Destailleur
48f5970c7a
Debug net measure
2019-10-21 14:43:39 +02:00
Frédéric FRANCE
86f22c4563
do not ignore lines with mix od tabs and spaces
2019-10-20 17:17:22 +02:00
Laurent Destailleur
49c101bb77
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-10-20 15:16:51 +02:00
Laurent Destailleur
d79114c1f8
Clean code
2019-10-20 15:16:40 +02:00
Laurent Destailleur
05fed5358a
Merge pull request #12179 from c3do/develop
...
NEW Add API to get objects by ref, ref_ext, ...
2019-10-20 13:42:18 +02:00
Laurent Destailleur
24dc7fb667
Merge pull request #12173 from OPEN-DSI/new-product-clone-customer-prices
...
NEW add clone customers prices in clone product or service
2019-10-20 13:27:50 +02:00
Frédéric FRANCE
7581275316
wip
2019-10-20 11:59:21 +02:00
c3do
ae3ce37a57
copyright mentions
2019-10-19 16:45:30 +02:00
c3do
6742700c04
Can get product by ref, ref_ext, barcode through API Rest
2019-10-19 16:36:11 +02:00
VESSILLER
801092d848
NEW add clone customers prices in clone product or service
2019-10-18 15:10:22 +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
c69e934f9c
Merge pull request #12135 from c3do/patch-1
...
NEW Can update product type with update method
2019-10-16 14:28:21 +02:00
Laurent Destailleur
4ca9fddfcc
Update product.class.php
2019-10-16 14:26:49 +02:00
Laurent Destailleur
b60ddc255c
Removed useless html tags
2019-10-16 14:17:53 +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
Cédric
3429cb7c1d
New: Update product type with update method
2019-10-14 22:42:38 +02:00
Cédric
2257706a30
New: Update product type with update method
2019-10-14 22:22:20 +02:00
Laurent Destailleur
0d21e61673
Merge pull request #12116 from frederic34/patch-18
...
fix travis
2019-10-14 20:53:42 +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
0cd451ef1a
Fix show duration in list of services
2019-10-14 15:06:21 +02:00
Laurent Destailleur
9922ff39ca
Fix show duration in list of services
2019-10-14 15:01:37 +02:00
Frédéric FRANCE
4e52276d1f
fix travis
2019-10-14 13:14:02 +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
9ba992b8b6
Work on inventory module
2019-10-12 12:31:35 +02:00
Laurent Destailleur
dccfdad9dd
Work on inventory feature
2019-10-12 11:32:47 +02:00
ptibogxiv
2b9be13a7c
Update card.php
2019-10-09 15:26:55 +02:00
Laurent Destailleur
29384d9a71
Merge branch 'develop' into patch-187
2019-10-09 13:02:47 +02:00
ptibogxiv
10c29887d6
Update product.class.php
2019-10-08 16:15:12 +02:00
ptibogxiv
e2d76f6f24
Update product.class.php
2019-10-08 16:13:59 +02:00
Laurent Destailleur
653958b1a2
Merge pull request #11094 from altatof/prodstats
...
NEW Extend option ORDER_ADD_ORDERS_WITH_PARENT_PROD_IF_INCDEC for all virtual product stats (renamed into PRODUCT_STATS_WITH_PARENT_PROD_IF_INCDEC)
2019-10-08 15:12:52 +02:00
Laurent Destailleur
71c18b7d65
Merge pull request #12062 from frederic34/patch-13
...
remove stock data from getsupplierprice
2019-10-08 14:50:41 +02:00
Laurent Destailleur
43a70e5548
Clean code to use the new $extrafields->attributes array
2019-10-08 09:28:50 +02:00
Frédéric FRANCE
41cdf0d5a0
remove stock data from getsupplierprice
...
stock data can be retrieved with get
2019-10-08 08:19:27 +02:00
Laurent Destailleur
80cbc09f21
Merge pull request #12046 from frederic34/apisupplierproduct
...
api supplier price delete
2019-10-07 10:22:48 +02:00
Laurent Destailleur
866dcf18fe
Look and feel v11
2019-10-06 15:34:22 +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
b895f8a78f
api supplier get purchase prices
2019-10-05 21:19:55 +02:00
Frédéric FRANCE
10671e3266
api supplier price delete
2019-10-05 21:15:13 +02:00
Laurent Destailleur
b883a8092a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/product.lib.php
htdocs/core/tpl/extrafields_list_search_input.tpl.php
htdocs/fourn/facture/card.php
htdocs/product/class/html.formproduct.class.php
2019-10-05 19:35:40 +02:00
altairis
85bbf1decb
Merge branch 'develop' into prodstats
2019-10-04 11:05:36 +02:00
Laurent Destailleur
1a66e0b05e
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/product/card.php
2019-10-03 17:53:59 +02:00
Laurent Destailleur
75be637b0b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-10-03 17:50:57 +02:00
Frédéric FRANCE
c5f729b945
Update list.php
2019-10-02 22:59:13 +02:00
Laurent Destailleur
d8a8c4fbe6
Look and feel v11. Picto are fontawesome.
2019-10-02 18:36:36 +02:00
Laurent Destailleur
24570f7165
Look and feel v11. Picto are fontawesome.
2019-10-02 18:14:41 +02:00
Laurent Destailleur
4928a999a0
Merge pull request #11933 from atm-gauthier/fix_conf_to_allow_changeproducttype
...
FIX : change product type must be allowed if we activate hidden conf
2019-10-01 14:41:52 +02:00
Laurent Destailleur
d448998762
Update card.php
2019-10-01 14:41:25 +02:00
gauthier
2167e7ed98
FIX : hidden conf to prevent from changing product_type
2019-10-01 09:12:51 +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
Alexandre SPANGARO
288aea190b
Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon
2019-09-28 06:09:40 +02:00
Alexandre SPANGARO
7f93f046e9
NEW Add fa_icon on load_fiche_titre
2019-09-28 06:02:25 +02:00
Laurent Destailleur
d0d884742f
FIX #11861 Not consistent code to manage measuring units
2019-09-27 19:45:33 +02:00
Laurent Destailleur
ea62ea8c70
Merge pull request #11901 from ptibogxiv/patch-263
...
NEW: delete purchase price API
2019-09-27 15:37:21 +02:00
VESSILLER
5f08a649eb
FIX empty cache when we want to load specific warehouses in select
...
Conflicts:
htdocs/product/class/html.formproduct.class.php
2019-09-27 15:10:05 +02:00
Laurent Destailleur
8ef227f24a
Merge pull request #11902 from OPEN-DSI/fix-formproduct-select-warehouses-cache
...
FIX empty cache when we want to load specific warehouses in select
2019-09-27 14:59:14 +02:00
Laurent Destailleur
acfceecda5
Merge pull request #11925 from OPEN-DSI/new-product-fournisseurs-units
...
NEW add units fields in buying price tab of product card
2019-09-27 14:17:52 +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
Laurent Destailleur
41101d3dbe
Merge pull request #11955 from bafbes/abb100078
...
fix:forgotten test condition
2019-09-27 11:30:03 +02:00
Laurent Destailleur
961f2b5165
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/categories/viewcat.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/takepos/invoice.php
2019-09-24 14:25:02 +02:00
Laurent Destailleur
6431e8e16d
FIX SQL injection on qty
2019-09-24 12:43:44 +02:00
Abbes Bahfir
1ca531239e
fix:forgotten test condition
2019-09-24 09:40:19 +01:00
Frédéric FRANCE
26cd418320
Update price_parser.class.php
2019-09-24 10:28:27 +02: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
gauthier
d40534e8fa
FIX : change product type must be allowed if we activate hidden conf
2019-09-19 15:21:52 +02:00
VESSILLER
ca18448b48
NEW add units fields in buying price tab of product card
2019-09-18 10:36:13 +02:00
VESSILLER
6e806a5aed
FIX empty cache when we want to load specific warehouses in select
2019-09-16 10:37:55 +02:00
ptibogxiv
ea1baefe9a
NEW: delete purchase price API
2019-09-15 20:50:18 +02:00
Laurent Destailleur
12d67c5f85
Rename api to get all purchase prices
2019-09-15 17:18:10 +02:00
Laurent Destailleur
68a3c5b41c
Merge pull request #11853 from ptibogxiv/patch-259
...
NEW add supplier's product list
2019-09-15 17:04:17 +02:00
Laurent Destailleur
5d0ba10f34
Update api_products.class.php
2019-09-15 17:04:08 +02:00
Laurent Destailleur
0194f48041
Merge pull request #10795 from altatof/clonecat
...
NEW : copy linked categories on product clone process
2019-09-15 16:34:42 +02:00
Laurent Destailleur
4a815da993
Merge pull request #11854 from OPEN-DSI/new-formproduct-loadWarehouses-stockmin-order
...
NEW add minimum stock filter in load warehoues for product form
2019-09-14 17:09:27 +02:00
VESSILLER
44fa2e4cd1
NEW multiselect with checkbox in categories/tags search for product list
2019-09-13 12:23:34 +02:00
stickler-ci
1e8663b1c8
Fixing style errors.
2019-09-10 18:48:55 +00:00
ptibogxiv
651fbde64d
Merge branch 'develop' into patch-187
2019-09-10 20:46:54 +02:00
Laurent Destailleur
61cf47aa16
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-09-10 00:14:07 +02:00
VESSILLER
6a734ea828
NEW add minimum stock filter in load warehoues for product form
2019-09-09 16:58:20 +02:00
stickler-ci
be66e1bd20
Fixing style errors.
2019-09-09 14:36:02 +00:00
ptibogxiv
f4a565544f
Update api_products.class.php
2019-09-09 16:33:12 +02:00
Laurent Destailleur
a5f7211730
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/install/repair.php
2019-09-06 16:10:55 +02:00
Laurent Destailleur
348ab4765c
Fix sql injection
2019-09-06 15:20:04 +02:00
Laurent Destailleur
529dd05226
Replace deprecated code
2019-09-06 10:53:05 +02:00
Laurent Destailleur
80daf29d79
Fix conflict between new module reception and old process
...
Fix inventory record does not need status at creation
Conflicts:
htdocs/fourn/commande/card.php
2019-09-06 01:55:22 +02:00
Laurent Destailleur
04adbd8c80
Fix conflict between new module reception and old process
...
Fix inventory record does not need status at creation
2019-09-06 01:52:51 +02:00
Christophe Battarel
1cfd5615d3
resolv conflict
2019-09-05 16:10:23 +02:00
Laurent Destailleur
f893854986
Fix remove warnings
2019-09-05 14:24:13 +02:00
Tim Otte
0f9b01cd5b
Added support for extrafield styling options:
...
- visibility now implemented
- fieldrequired now implemented
2019-09-05 09:47:40 +02:00
Tim Otte
be000b96ee
Fixed error that occurred in the travis CI build
2019-09-04 16:42:13 +02:00
Tim Otte
fbafbc3e19
Added myself to the author list
2019-09-04 15:16:29 +02:00
Tim Otte
54d0b94b6d
Added extrafield support to the product supplier price lines
2019-09-04 15:13:42 +02:00
Frédéric FRANCE
a5aedacb7e
Update productbatch.class.php
2019-09-03 16:49:41 +02:00
Laurent Destailleur
ffcea3dfd8
Fix phpcs
2019-09-03 14:48:06 +02:00
Laurent Destailleur
71dadc9bd4
Merge pull request #11757 from ptibogxiv/patch-246
...
NEW purchase_prices API
2019-09-03 13:03:31 +02:00
Laurent Destailleur
d4fb1d134d
Merge pull request #11801 from jtraulle/fix-11682-10.0
...
Fix #11683 Correct links to create a new product or service from search results
2019-09-03 13:02:17 +02:00
Abbes Bahfir
f945ec5771
fix: convert posted price formatted values to numeric
2019-09-02 21:24:53 +01:00
Jean Traullé
c84f1baf17
Fix #11683 Correct links to create a new product or service from search results
2019-08-31 00:18:53 +02:00
Laurent Destailleur
321e41ceed
Fix graph
2019-08-30 04:17:07 +02:00
Laurent Destailleur
6009601254
Use graph for stats on products/services
2019-08-30 04:15:24 +02:00
Laurent Destailleur
55505604c1
Merge pull request #11397 from atm-josselin/FIX_product_document_and_special_characters
...
FIX : filepath of generated documents doesn't handle products with sp…
2019-08-27 14:12:48 +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
ptibogxiv
d7cc76b94a
NEW purchase_prices API
2019-08-26 20:10:00 +02:00
ptibogxiv
1b4788c6d0
Update product.class.php
2019-08-24 14:21:41 +02:00
Laurent Destailleur
3339f89fc5
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/api/class/api_login.class.php
htdocs/dav/fileserver.php
2019-08-22 12:45:23 +02:00
Laurent Destailleur
27cd6cd308
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/compta/paiement.php
htdocs/product/fournisseurs.php
htdocs/stripe/payment.php
2019-08-22 12:39:07 +02:00
Laurent Destailleur
a35f010e55
FIX name and position of hook FIX #11710
2019-08-22 12:30:14 +02:00
Laurent Destailleur
db220d25c2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-16 21:48:53 +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
9799153171
Merge pull request #11695 from jtraulle/fix-11683
...
Fix #11683 Correct links to create a new product or service from search results
2019-08-16 17:49:55 +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
Jean Traullé
4bed1b9a3d
Fix #11683 Correct links to create a new product or service from search results
2019-08-15 22:21:31 +02:00
Laurent Destailleur
fa53641221
Merge pull request #11551 from atm-quentin/NEW_global_search_product
...
NEW Add hidden option to set fields for the quick search on products
2019-08-15 20:26:05 +02:00
Laurent Destailleur
8a126800e7
Merge pull request #11650 from ptibogxiv/patch-217
...
FIX count negative in stats with credit note
2019-08-15 19:36:21 +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
ptibogxiv
0ce22d68ef
Update product.class.php
2019-08-10 09:43:26 +02:00
ptibogxiv
4f69be2c2c
Update product.class.php
2019-08-10 09:12:40 +02:00
ptibogxiv
33cf4d8417
Update product.class.php
2019-08-10 09:12:15 +02:00
Laurent Destailleur
3351a1687c
Fix phpcs
2019-08-10 02:17:07 +02:00
Laurent Destailleur
8647a20c18
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/langs/en_US/admin.lang
htdocs/product/dynamic_price/class/price_parser.class.php
htdocs/product/stats/facture.php
2019-08-10 01:57:43 +02:00
Laurent Destailleur
2824dee11a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/product/dynamic_price/class/price_parser.class.php
2019-08-10 01:20:17 +02:00
Laurent Destailleur
6a8910f109
Merge pull request #11649 from ptibogxiv/patch-216
...
FIX qty in invoice list on product's stats
2019-08-10 00:37:35 +02:00
Je2fb
2dee289fc6
Update price_parser.class.php
...
Calculation with supplier_min_price work
Conflicts:
htdocs/product/dynamic_price/class/price_parser.class.php
2019-08-10 00:21:13 +02:00
Laurent Destailleur
88c66d24fe
Merge pull request #11662 from ptibogxiv/patch-219
...
FIX duration when creating service
2019-08-09 23:53:55 +02:00
Laurent Destailleur
6d4ba6b36b
Merge branch 'develop' into develop
2019-08-09 23:49:31 +02:00
Regis Houssin
0b831ccdf7
FIX better help message with multicompany
2019-08-09 09:33:14 +02:00
Je2fb
1a592f8f69
Update price_parser.class.php
2019-08-08 09:34:59 +02:00
Je2fb
4008ddc567
Update price_parser.class.php
2019-08-08 09:33:03 +02:00
ptibogxiv
322ec32ff5
FIX duration when creating service
2019-08-07 20:16:53 +02:00
Je2fb
ef285a87a8
Update price_parser.class.php
...
Calculation with supplier_min_price work
2019-08-07 17:16:34 +02:00
ptibogxiv
3e94b3dc59
FIX count negative in stats whithcredit note
2019-08-06 16:54:44 +02:00
ptibogxiv
0fc92b92a2
Update facture.php
2019-08-06 16:47:54 +02:00
ptibogxiv
ee8d99351d
Update facture.php
2019-08-06 16:28:18 +02:00
Frédéric FRANCE
69985339d8
Update price_parser.class.php
2019-08-06 11:47:34 +02:00
ptibogxiv
d22c2960b7
Update product.class.php
2019-08-06 00:14:19 +02:00
ptibogxiv
2d77bfd873
Update product.class.php
2019-08-04 14:50:25 +02:00
ptibogxiv
c9e481d6f7
Update product.class.php
2019-08-04 14:09:59 +02:00
ptibogxiv
f5f6882583
Update product.class.php
2019-08-04 13:42:50 +02:00
atm-quentin
bd2f5ba037
FIX Replace conf by hidden conf editable by user
2019-07-26 14:16:54 +02:00
Laurent Destailleur
0c6499f193
Update product.php
2019-07-25 18:01:47 +02:00
Laurent Destailleur
9a0e0fbdd2
Update product.php
2019-07-25 18:01:16 +02:00
Laurent Destailleur
a46bfc7a29
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/project.lib.php
2019-07-25 17:54:14 +02:00
Alexandre SPANGARO
323d2df210
Presentation nowrap on amount
2019-07-24 10:42:00 +02:00
atm-quentin
0ff121e7f1
add some new field on global search
2019-07-24 09:42:52 +02:00
atm-quentin
03ed4eb141
modif rowspan
2019-07-24 09:42:39 +02:00
atm-quentin
5a385bf1cc
ADD extrafields on global search
2019-07-24 09:41:02 +02:00
Laurent Destailleur
50480bf517
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/opensurvey/index.php
2019-07-18 18:23:24 +02:00
Laurent Destailleur
fb5af65f4d
FIX #11466
2019-07-15 23:56:05 +02:00
Laurent Destailleur
adfbd62f8b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-14 00:44:35 +02:00
Laurent Destailleur
694be619b2
Fix doxygen
2019-07-11 22:16:32 +02:00
Laurent Destailleur
f5cc29417d
Translation lignes -> lines
2019-07-05 21:50:35 +02:00
Laurent Destailleur
0a7d70829f
Translation of some comments
2019-07-05 21:37:25 +02:00
Laurent Destailleur
2fee41f712
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-04 12:27:00 +02:00
Laurent Destailleur
8e3620fce1
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/compta/facture/invoicetemplate_list.php
2019-07-04 12:26:17 +02:00
Laurent Destailleur
80bbc2577e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-04 12:09:26 +02:00
Laurent Destailleur
b065cbc6f8
FIX #11446
2019-07-04 12:09:04 +02:00
Laurent Destailleur
3d0a5d9f00
Merge pull request #11442 from atm-john/9.0_Fix_column_price_display
...
Fix column price display
2019-07-04 10:50:35 +02:00
John Botella
0288338364
Fix column price display
2019-07-02 14:38:09 +02:00
atm-quentin
8cdb251ca5
FIX product_use_units was set to 0 each time a conf in block other was set
2019-07-02 10:18:03 +02:00
atm-josselin
c24a95b7ad
Sanitize at creation of the product instead of the creation of the filepath
2019-07-01 09:31:01 +02:00
Laurent Destailleur
b177787f0a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
htdocs/product/class/product.class.php
2019-06-29 18:28:51 +02:00
Laurent Destailleur
adb3062a9f
Work on nblignes -> nblines
2019-06-29 16:38:14 +02:00
Laurent Destailleur
93b0e45246
Fix duplicate class in some cases
2019-06-29 02:27:58 +02:00
Laurent Destailleur
d71330c00b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-29 02:04:16 +02:00
Laurent Destailleur
36e240a16d
NEW Add statistics on product into contracts
2019-06-29 02:03:57 +02:00
Laurent Destailleur
8aebcc45b2
Fix message to not show sometimes
2019-06-29 01:54:38 +02:00
Laurent Destailleur
97827f5172
Fix print
2019-06-29 01:44:49 +02:00
Laurent Destailleur
1b33952028
Update facture.php
2019-06-28 12:37:22 +02:00
ptibogxiv
55bd67058b
Update facture.php
2019-06-26 14:10:52 +02:00
atm-quentin
7f62fdbfe4
FIX buyprice barcode default val
2019-06-25 14:27:44 +02:00
atm-quentin
4b3824a1a9
FIX buyprice barcode default val
2019-06-25 14:17:31 +02:00
Laurent Destailleur
fa476b4994
Properties ->libelle_incoterms were renamed into ->label_incoterms
2019-06-25 13:00:02 +02:00
Laurent Destailleur
3ca258c93d
Remove dead code
2019-06-24 22:58:21 +02:00
Laurent Destailleur
a7bd734ece
Rename ->produit into ->product. Still permissions to rename.
2019-06-24 21:18:49 +02:00
Laurent Destailleur
efa09301b1
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-22 20:19:14 +02:00
Laurent Destailleur
b202c7eaa0
Fix confusion between ->childs and ->childsoncascade
2019-06-22 20:17:40 +02:00
Laurent Destailleur
5675e7c50e
Clean code of deprecated method
2019-06-22 18:19:40 +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
6975e18233
Fix phpcs
2019-06-20 13:59:04 +02:00
Laurent Destailleur
e9da44e023
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-20 12:33:02 +02:00
Laurent Destailleur
1a6dc83d4c
Fix: default accounting account for eec and export sales were not used.
2019-06-20 12:25:58 +02:00
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
Laurent Destailleur
4308f48cad
Merge branch 'develop' into MissingHook
2019-06-20 03:04:32 +02:00
Alexandre SPANGARO
47c2f6fac4
NEW Add column VAT rate in product list
2019-06-19 21:35:35 +02:00
Nicolas ZABOURI
2e4db8c83c
Merge remote-tracking branch 'Dolibarr/10.0' into MissingHook
2019-06-19 08:39:05 +02:00
Laurent Destailleur
663998bab1
Fix scrutinizer errors
2019-06-18 20:15:04 +02:00
ICstage
820c420ae5
FIX Missing hooks
2019-06-18 14:07:52 +02:00
Laurent Destailleur
08d5ca4ddb
Debug page to export accounting documents
2019-06-17 17:53:43 +02:00
Francis Appels
a26c868783
Fix scrutinizer bugs
2019-06-12 22:05:10 +02:00
Francis Appels
2ecde139f0
Fix stock mouvement does not need virtual stock.
2019-06-07 18:09:03 +02:00
Josep Lluís
bb0313a1a4
Fix Hide disabled fields
...
Hide disabled fields in product list
2019-06-07 15:23:20 +02:00
Lionel VESSILLER
9a974814fa
NEW add extrafields in warehouses
...
- fix load lang stocks
2019-06-03 15:53:21 +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
2218994958
FIX Duplicate encoding on error message
2019-05-29 09:51:45 +02:00
Laurent Destailleur
815a467eb7
Debug clone of products
2019-05-22 19:54:03 +02:00
Laurent Destailleur
18f1952e2d
Fix set of properties
2019-05-22 14:49:18 +02:00
Laurent Destailleur
e60131e3ee
Fix look and feel v10
2019-05-22 13:42:27 +02:00
Laurent Destailleur
c1a0e9385f
Merge pull request #11219 from frederic34/patch-2
...
dol_print_object_info return void
2019-05-21 22:38:39 +02:00
Laurent Destailleur
22e897b1a1
Clean and prepare code to fix a SQL injection
2019-05-21 17:22:38 +02:00
Laurent Destailleur
e463b17c15
Fix look and feel v10
2019-05-21 15:31:56 +02:00
Laurent Destailleur
5f23cf7e2a
CSS
2019-05-19 13:51:47 +02:00
Frédéric FRANCE
53a09a0dd4
Update agenda.php
2019-05-19 09:15:51 +02:00
Laurent Destailleur
94f5f6c655
Merge pull request #11207 from atm-john/FIX_scrutyniser
...
FIX: scrutinizer feedback
2019-05-18 16:05:24 +02:00
Laurent Destailleur
11fea03074
Merge pull request #11026 from atm-john/new_look_and_feel_title_button
...
NEW : look and feel title button
2019-05-18 16:04:47 +02:00
ATM John BOTELLA
f714b45efb
FIX scrutinizer feedback
2019-05-18 15:53:07 +02:00
Laurent Destailleur
fd5048ef73
Fix reported by phpstan
2019-05-15 19:16:48 +02:00
Laurent Destailleur
49d65710ba
Fix date missing
2019-05-14 10:31:11 +02:00
Laurent Destailleur
04f7261bfc
Fix field date was not visible
2019-05-13 21:34:30 +02:00
Laurent Destailleur
75646e365d
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contrat/list.php
htdocs/contrat/services_list.php
htdocs/expensereport/list.php
htdocs/product/list.php
htdocs/product/reassort.php
htdocs/product/reassortlot.php
htdocs/projet/list.php
2019-05-13 12:28:16 +02:00
Laurent Destailleur
9242c1a630
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
ChangeLog
htdocs/contrat/services_list.php
htdocs/core/lib/files.lib.php
htdocs/filefunc.inc.php
htdocs/product/list.php
2019-05-13 12:22:14 +02:00
Juanjo Menent
f4ca6916cd
Merge remote-tracking branch 'upstream/7.0' into 8.0
...
# Conflicts:
# htdocs/contrat/services_list.php
# htdocs/expensereport/list.php
# htdocs/projet/list.php
2019-05-11 17:31:23 +02:00
Juanjo Menent
6206519456
Fix: missing GETPOST params
2019-05-11 16:54:56 +02:00
Juanjo Menent
2e6cb2afaa
Fix: missing GETPOST params
2019-05-11 16:53:16 +02:00
Juanjo Menent
dc9f8a349f
Fix: missing GETPOST params
2019-05-11 16:50:31 +02:00
Laurent Destailleur
3def11d5c9
Standardize translation
2019-05-10 19:32:46 +02:00
Laurent Destailleur
aaeb7dc9d6
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/holiday.php
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/filefunc.inc.php
htdocs/product/list.php
2019-05-10 17:45:33 +02:00
Laurent Destailleur
95326c3d63
Update list.php
2019-05-10 16:27:38 +02:00
John BOTELLA
f296093f8d
fix travis
2019-05-10 15:52:46 +02:00
Regis Houssin
8a29d9f2d1
FIX possibility to override permissions (multicompany)
2019-05-10 11:23:19 +02:00
Juanjo Menent
2df026b903
FIX : #11032
2019-05-09 20:59:22 +02:00
Laurent Destailleur
a94c291b76
Dolibarization
2019-05-09 16:59:06 +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
b62b09df66
Merge pull request #11147 from frederic34/patch-2
...
fix reassort with not using product units
2019-05-08 18:33:10 +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
Frédéric FRANCE
5fd3109e7f
fix reassort with no product units
2019-05-08 16:28:18 +02:00
Laurent Destailleur
d86f0b7407
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-05-08 13:27:36 +02:00
Laurent Destailleur
a67d6e7208
css
2019-05-08 13:27:26 +02:00
Laurent Destailleur
af2c158821
Update reassort.php
2019-05-08 02:11:50 +02:00
Laurent Destailleur
953c9148ff
Update reassort.php
2019-05-08 02:11:12 +02:00
Rüdiger Hahn
475290a4b9
Show unit values if configured
...
Fix: Fetch unit values from db and display them if this has been configured
2019-05-07 09:02:48 +02:00
Laurent Destailleur
c4798c34b0
Fix autocompletion of product on stock correction
2019-05-07 00:26:31 +02:00
Laurent Destailleur
15dc5f9d23
Fix css
2019-05-04 16:46:09 +02:00
atm-greg
e0c3cf8360
fix project link for stock correction
2019-05-03 10:24:49 +02:00
Christophe Battarel
face07ece1
new constant PRODUCT_STATS_WITH_PARENT_PROD_IF_INCDEC
2019-05-01 15:15:20 +02:00
ptibogxiv
61f2b84f5f
FIX : error with call IsInEEC
2019-04-28 00:49:21 +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
e5c2027dbb
NEW Add accounting code for eec sales and export sales on products
2019-04-25 01:16:29 +02:00
Laurent Destailleur
aa9184905a
FIX Duration is lost when editing
2019-04-25 00:11:08 +02:00
Laurent Destailleur
fe1b884966
Add missing methods
2019-04-23 12:20:59 +02:00
Laurent Destailleur
c0c723a207
Work on inventory feature
2019-04-23 11:00:28 +02:00
ATM-Nicolas
6cfdfe8408
NEW : Can update product supplier price ref
2019-04-19 10:58:18 +02:00
ATM john
684879d73c
apply appli btn to more elements
2019-04-16 21:49:26 +02:00
John BOTELLA
7372e8c610
Appli function to links
2019-04-15 15:47:36 +02:00
Laurent Destailleur
cf058e7d3b
NEW Ask date of invoice when using the Clone feature.
2019-04-12 12:12:08 +02:00
Laurent Destailleur
cb08bf6021
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/class/product.class.php
2019-04-11 16:25:33 +02:00
Laurent Destailleur
54b3acc997
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/product/class/product.class.php
2019-04-11 16:23:56 +02:00
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
gauthier
9a24007c0a
FIX : better test
2019-04-11 15:32:50 +02:00
gauthier
524b186959
FIX : Product accountancey sell intra code must be visible if main feature level 1
2019-04-11 15:19:40 +02:00
Laurent Destailleur
3cfeba0113
Standardize code
2019-04-09 01:23:27 +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
Ion
06d3b5792c
Fix dynamic prices bug caused by arg displacement
2019-04-07 21:41:31 +02:00
Christophe Battarel
8e2ef8e56c
remove old dev
2019-04-05 11:42:12 +02:00
Christophe Battarel
45b3a0588f
remove old dev
2019-04-05 11:40:57 +02:00
Christophe Battarel
f167ad910e
camelCase and generic cloneCategories function
2019-04-05 11:30:51 +02:00
Laurent Destailleur
fff9b7db9d
Fix doxygen
2019-04-04 18:33:12 +02:00
Laurent Destailleur
5891d0a056
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/list.php
htdocs/projet/list.php
2019-04-04 17:45:02 +02:00
Laurent Destailleur
9c7464d157
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/list.php
htdocs/societe/card.php
2019-04-04 17:42:12 +02:00
Laurent Destailleur
fa95f5575c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/product/list.php
2019-04-04 17:41:22 +02:00
Laurent Destailleur
eaf9a2402a
Fix length of label
2019-04-04 17:39:51 +02:00
Laurent Destailleur
e79204e81a
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/product/list.php
2019-04-04 17:13:52 +02:00
Laurent Destailleur
4489db2a70
Fix field surface/weight not loaded
2019-04-04 17:06:26 +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
Laurent Destailleur
8fe1be1a67
Removed deprecated use of string in dol_print_date(). Only date allowed.
2019-04-01 19:27:34 +02:00
Laurent Destailleur
1b2826f476
Look and feel v10
2019-03-29 13:26:26 +01:00
Laurent Destailleur
50395b7dd7
New: Input field to search product always visible with focus so you can
...
use a barcode flasher at any time
2019-03-28 18:51:04 +01:00
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
1b558d70c1
Fix menu translation
2019-03-22 12:42:23 +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
5d21547854
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/product/price.php
htdocs/user/perms.php
2019-03-21 12:20:24 +01:00
Laurent Destailleur
9a3c66b057
Merge pull request #10846 from grandoc/new_branch_15_03_2019
...
New branch 15 03 2019
2019-03-19 12:13:02 +01:00
Laurent Destailleur
1a8902f23e
Fix migration for compatibility
2019-03-19 12:03:02 +01:00
Laurent Destailleur
1a05cdfaa1
Fix regressions in selecting duration of service
2019-03-19 11:42:50 +01:00
ATM-Nicolas
1cf42726ff
FIX : Duplicate executeHook function
2019-03-18 15:19:39 +01:00
Christophe Battarel
7bc0260661
begin factorization of categories cloning
2019-03-18 14:15:55 +01:00
ptibogxiv
8657ff034b
Update card.php
2019-03-18 13:48:16 +01:00
Frédéric FRANCE
5e6d9691e4
phpcs fix
2019-03-16 19:12:45 +01:00
Laurent Destailleur
e7543a26b1
Merge branch 'develop' into patch-1
2019-03-16 14:22:36 +01:00
Philippe GRAND
bcfaf4bb1b
update with html5 compliant code
2019-03-15 09:55:06 +01:00
Philippe GRAND
c958bf49d0
update with html5 compliant code
2019-03-15 09:54:10 +01:00
Philippe GRAND
14abf357e7
update with html5 compliant code
2019-03-15 09:53:06 +01:00
Philippe GRAND
6bdac445c5
update with html5 compliant code
2019-03-15 09:50:53 +01:00
Philippe GRAND
89da4fbdc1
update with html5 compliant code
2019-03-15 09:49:07 +01:00
Philippe GRAND
7c916666a6
update with html5 compliant code
2019-03-15 09:48:32 +01:00
Laurent Destailleur
7c59629e66
Fix phpcs
2019-03-15 02:32:21 +01:00
Laurent Destailleur
86c5dc20e3
NEW Can choose the root category to show for TakePOS module
2019-03-15 02:12:40 +01:00
Laurent Destailleur
2713c430df
Merge branch 'develop' into dev_datepricefour
2019-03-14 18:43:09 +01:00
Laurent Destailleur
5aee322b30
Update fournisseurs.php
2019-03-14 18:36:05 +01:00
Laurent Destailleur
8f65ee2296
Merge branch 'develop' into NEW_develop_supplier_buyprice_barcode
2019-03-14 17:48:44 +01:00
Laurent Destailleur
3c40d5d30c
Merge pull request #10821 from OPEN-DSI/fix-select-measuring-units
...
Fix measure unit id in select options
2019-03-14 14:10:13 +01:00
Laurent Destailleur
993183aec6
Merge pull request #10817 from wdammak/patch-35
...
Fix Warning: Invalid argument - dynamic_price
2019-03-14 14:09:21 +01:00
Frédéric FRANCE
ba749ffc8c
Update product.class.php
2019-03-14 09:14:29 +01:00
Lionel VESSILLER
17dd88d397
Fix measure unit id in select options
2019-03-13 14:05:32 +01:00
wdammak
b651b7ec07
Fix Warning: Invalid argument - dynamic_price
2019-03-13 01:03:12 +01:00
Laurent Destailleur
98ca9bf17a
Reduce quantity of string to translates
2019-03-12 19:44:59 +01:00
Laurent Destailleur
3559d600e2
Merge pull request #10770 from atm-john/theme_badge_status
...
Add badge status css part1
2019-03-11 20:49:31 +01:00
John BOTELLA
57c6c60118
Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status
2019-03-11 14:44:35 +01:00
Christophe Battarel
3215e066e4
copy linked categories when cloning a product
2019-03-11 10:00:44 +01:00
Frédéric FRANCE
86c1694195
update doc in product class
2019-03-09 10:36:39 +01:00
Laurent Destailleur
d99f4c1726
Fix var not used
2019-03-09 01:08:50 +01:00
Scrutinizer Auto-Fixer
68188ffda1
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-03-09 00:02:05 +00:00
Frédéric FRANCE
e845b96f2b
Update product.class.php
2019-03-07 22:40:16 +01:00
Laurent Destailleur
4c75e6644d
Fix css
2019-03-07 21:57:03 +01:00
John BOTELLA
ca10b1e403
add new dolGetStatus to LibStatut in product class
2019-03-07 11:37:54 +01:00
Laurent Destailleur
a426c8e9bf
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/compta/facture/class/facture.class.php
htdocs/filefunc.inc.php
htdocs/install/upgrade2.php
htdocs/product/class/product.class.php
2019-03-07 11:16:24 +01:00
Laurent Destailleur
b15e00cae7
FIX Autodetect buy price for invoices autogenerated with templates.
2019-03-06 21:39:09 +01:00
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
06a40726bb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-03-04 16:29:23 +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
3b48808916
Update list.php
2019-03-04 16:13:38 +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
futurehousestore
b710a41707
Update list.php
...
Display full product name
2019-03-03 16:23:10 +00:00
Frédéric FRANCE
014f69850e
add visibility
2019-03-01 23:08:57 +01:00
Frédéric FRANCE
bd2e541fd6
add visibility
2019-03-01 18:28:51 +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
atm-quentin
f51b89def3
NEW supplier buyprice barcode
2019-02-27 09:22:34 +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
390766babf
replace html code by html5
2019-02-23 23:36:21 +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
1c3541295b
FIX wrong class name "CUnits instead CMeasuringUnits"
2019-02-19 09:24:30 +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
florian HENRY
dd9896516b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_importproduct_measuringunit
Conflicts:
htdocs/margin/agentMargins.php
htdocs/product/stock/movement_card.php
htdocs/projet/tasks/time.php
htdocs/resource/class/html.formresource.class.php
2019-02-13 12:52:07 +01:00
Laurent Destailleur
44fd36b15c
Fix phpcs
2019-02-13 12:39:26 +01:00
florian HENRY
37c66c2ece
travis
2019-02-13 12:32:06 +01:00
Laurent Destailleur
ced386fdca
Fix phpcs
2019-02-13 11:32:00 +01:00
florian HENRY
de87321c15
fix travcis
2019-02-13 10:28:08 +01:00
florian HENRY
5c059c897d
fix travis (mosty for dev no conerne by my changes)
2019-02-13 09:21:14 +01:00
florian HENRY
d88475c61a
Merge branch 'develop' of local repository into dev_importproduct_measuringunit
2019-02-13 08:59:18 +01:00
Frédéric FRANCE
484acc2e00
fix phpcs
2019-02-12 20:55:55 +01:00
florian HENRY
5b5f96bafb
NEW : measuring unit dictionnary and product size/unit import
2019-02-12 16:58:11 +01:00
Laurent Destailleur
41863bb127
Merge
2019-02-12 16:42:51 +01:00
Frédéric FRANCE
b041eeae22
first parameter of print_liste_field_titre was translated
2019-02-10 18:11:34 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature
2019-02-10 10:45:49 +01:00
Laurent Destailleur
38d4284638
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/db/pgsql.class.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/filefunc.inc.php
htdocs/imports/import.php
htdocs/supplier_proposal/card.php
2019-02-08 11:26:08 +01:00
Laurent Destailleur
fe1188c4ea
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/filefunc.inc.php
2019-02-08 10:44:45 +01:00
atm-quentin
730a2a90ff
FIX supplier invoice product stats total ht is line total not invoice total
2019-02-05 09:43:14 +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
Laurent Destailleur
a6dde3d6bd
Merge branch 'develop' into nospaceaftercomma
2019-02-03 19:27:16 +01:00
Laurent Destailleur
9f7dfe2921
Merge pull request #10481 from frederic34/psr2forloop
...
psr2 Squiz.ControlStructures.ForEachLoopDeclaration
2019-02-03 19:11:07 +01:00
Laurent Destailleur
e309261140
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-03 18:19:58 +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
Frédéric FRANCE
03701fa091
psr2
2019-02-02 18:25:01 +01:00
Laurent Destailleur
ebe30f7a0e
FIX error report not returned
2019-02-01 19:19:23 +01:00
Frédéric FRANCE
f5b2cf75f2
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-02-01 18:31:44 +01:00
Laurent Destailleur
6de732d7f8
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/facture/mod_facture_mars.php
htdocs/core/modules/facture/mod_facture_terre.php
2019-02-01 16:07:18 +01:00
Laurent Destailleur
35f65a571c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/modules/facture/mod_facture_mars.php
htdocs/core/modules/facture/mod_facture_terre.php
htdocs/fourn/commande/list.php
2019-02-01 16:05:43 +01:00
Pierre Ardoin
2d6f5ca8ab
#Fix : Error in Total Products/Services
...
Its correct an error in the total of stat Products/Services total.
2019-01-31 20:22:56 +01:00
Frédéric FRANCE
b766204690
wip
2019-01-30 22:53:47 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma
2019-01-30 18:27:35 +01:00
Laurent Destailleur
408609e0ec
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/tpl/objectline_edit.tpl.php
2019-01-30 16:54:38 +01:00
Laurent Destailleur
9fdba921b4
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/lib/functions.lib.php
2019-01-30 16:48:33 +01:00
Laurent Destailleur
81ae4c52c5
Merge pull request #10446 from mapiolca/8.0
...
Fix #10317 et #10318
2019-01-30 16:43:14 +01:00
Laurent Destailleur
d0b20178e0
Merge pull request #10442 from aspangaro/10.0_accountancy_default
...
NEW: When you create product or service, sell accountancy account by default are proposed
2019-01-30 16:30:13 +01:00
Laurent Destailleur
e72d6c50e6
Merge pull request #10428 from frederic34/toomanylines
...
PSR2.Files.EndFileNewline.TooMany
2019-01-30 16:17:09 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma
2019-01-30 16:00:11 +01:00
Pierre Ardoin
99892c13b0
FIX : Erreur dans le Total
...
Corrige l'erreur de calcul dans le total des produits et services
2019-01-29 23:26:08 +01:00
Alexandre SPANGARO
64975b3b9e
NEW: When you create product or service, sell accountancy account by default are proposed
2019-01-28 22:27:55 +01:00
Alexandre SPANGARO
cc88c4f8ff
Move my email to the new one
2019-01-28 21:39:22 +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
ecc30b8ffe
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
2019-01-27 18:27:58 +01:00
Laurent Destailleur
12e75cb8c9
Merge pull request #10401 from aspangaro/10.0_accountancy2
...
NEW: Automatically binding for intra/export accountancy code in customer list
2019-01-27 18:06:08 +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
Laurent Destailleur
cc574852d2
Fix phpcs
2019-01-26 15:20:36 +01:00
Laurent Destailleur
ab262237b2
Merge pull request #10393 from fappels/10_add_product_dimensions
...
NEW Show product dimensions in product list tooltip.
2019-01-26 14:14:03 +01:00
Laurent Destailleur
60c9eccbc4
Merge pull request #10395 from fappels/10_work_on_supplier_price_history
...
Work on #10394 supplier price history
2019-01-26 14:08:15 +01:00
Laurent Destailleur
a5daa25707
Move common code to get sell price into a method
2019-01-24 19:45:17 +01:00
Alexandre SPANGARO
9ff848210f
NEW: Automatically binding for intra/export accountancy code
2019-01-23 22:14:13 +01:00
jfefe
b3dfbaf38c
FIX: wrong permission test for inventory creation
2019-01-23 02:45:46 +01:00
Francis Appels
7ad48064be
Add code to show in fourn price tooltip.
2019-01-22 16:18:25 +01:00
Francis Appels
9227d9fe9b
Show product dimensions in product list tooltip.
2019-01-22 12:42:02 +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
atm-quentin
013c078c8b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice
2019-01-16 10:52:46 +01:00
Laurent Destailleur
126e02798a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/cashdesk.lang
htdocs/langs/fr_FR/cashdesk.lang
2019-01-07 19:49:15 +01:00
Laurent Destailleur
1306918eb0
FIX #10299
2019-01-07 16:03:55 +01:00
JC Prieto
99e2f893fd
Fix: loadBatchInfo()
2019-01-02 19:38:44 +01:00
Laurent Destailleur
f965e9ec7a
Merge pull request #10270 from prietojc/patch-3
...
FIX: loadBatchInfo()
2019-01-02 19:38:25 +01:00
Laurent Destailleur
422e18ee8e
Merge pull request #10268 from hregis/develop_upgrade
...
FIX remove old unused and deprecated function "getStaticMember"
2019-01-02 19:37:49 +01:00
JC Prieto
d43adbce71
Fix: loadBatchInfo()
2018-12-26 20:42:26 +01:00
Laurent Destailleur
5c516fdae2
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2018-12-26 19:43:01 +01:00
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
85375495e5
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/product/class/product.class.php
htdocs/public/notice.php
htdocs/user/card.php
2018-12-22 19:06:58 +01:00
Laurent Destailleur
8d39edf430
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/product/price.php
2018-12-22 18:59:49 +01:00
Laurent Destailleur
850b939ffd
FIX CVE-2018-19994
2018-12-22 17:03:50 +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
ATM-Nicolas
96144e18f1
FIX : Function updatePrice with wrong parameters
2018-12-18 15:27:32 +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
e14b426985
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/exports/export.php
2018-12-16 13:39:16 +01:00
Laurent Destailleur
54a4a54afe
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/langs/en_US/banks.lang
2018-12-15 20:00:31 +01:00
Norbert Penel
0f3a063c91
Events are not linked to products
...
when created from a product card, the events are not linked to the product
2018-12-15 15:57:15 +01:00
Laurent Destailleur
2d4403c3bf
Merge pull request #10184 from homer8173/patch-5
...
Events are not linked to products
2018-12-15 15:46:22 +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
2d2481cc5f
Merge pull request #10068 from prietojc/patch-2
...
New: Update just the multiprices that have been changed
2018-12-14 19:22:26 +01:00
Laurent Destailleur
88a52aa11d
Merge branch 'develop' into develop_mc
2018-12-14 15:58:52 +01:00
Laurent Destailleur
2011afe6fb
Merge branch 'develop' into actionrefused
2018-12-14 15:48:24 +01:00
Laurent Destailleur
83efdee7d3
Merge branch 'develop' into new_mass_generate
2018-12-14 15:44:46 +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
Laurent Destailleur
177675b73d
Merge pull request #10225 from madx666/contrib
...
Change type_mouvement on movement_list
2018-12-14 10:40:00 +01:00
Laurent Destailleur
f97b561af0
Merge branch 'develop' into qual_rename_facnumber
2018-12-13 20:24:12 +01:00
madx666
3159c3f8d1
Change type_mouvement on movement_list
2018-12-13 11:28:49 +01:00
BENKE Charlene
946d55a7bb
fk_default_warehouse not defined
2018-12-12 00:41:11 +01:00
ATM John BOTELLA
6a4df05fd0
fix error message details
2018-12-08 17:29:07 +01:00
Norbert Penel
b4475e434f
Events are not linked to products
...
when created from a product card, the events are not linked to the product
2018-12-05 15:18:45 +01:00
Regis Houssin
8953a3ed73
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
Conflicts:
ChangeLog
2018-12-03 08:46:03 +01:00
Maxime Kohlhaas
2e496ea83a
QUAL rename facnumber by ref
2018-12-02 17:33:44 +01:00
Laurent Destailleur
6d84036f66
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/index.php
htdocs/contact/list.php
htdocs/core/class/html.form.class.php
htdocs/expensereport/card.php
htdocs/install/doctemplates/shipment/template_shipment.odt
htdocs/public/payment/newpayment.php
2018-12-01 19:23:06 +01:00
Laurent Destailleur
cb9ada2119
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/class/html.formmail.class.php
htdocs/core/modules/modSociete.class.php
htdocs/product/price.php
2018-12-01 18:19:45 +01:00
BENKE Charlene
1dc2fc5060
fix #9475
2018-12-01 16:17:52 +01:00
Inovea Conseil
0ba5fda3da
Update price.php
2018-12-01 16:11:49 +01:00
Inovea Conseil
8964ec7ea1
Fix #9572
...
Fix #9572
2018-12-01 15:58:37 +01:00
ptibogxiv
310dc46113
Update list.php
2018-11-29 13:44:42 +01:00
ptibogxiv
31e3b82ca6
Fix duration display product/service in list.php
2018-11-29 13:44:10 +01:00
Philippe GRAND
05d617b759
fix typo error
2018-11-26 14:33:45 +01:00
JC Prieto
54418c168b
New: Update only the multiprices that have been changed
...
When a multiprice was changed all level prices were updated at once and history of prices is getting very large.
2018-11-22 12:38:10 +01:00
Thibault Descamps
c2e5a29246
NEW redirect if only one result on global search on card
2018-11-22 11:36:30 +01:00
atm-quentin
7571760fdd
fix errors during cherry picking
2018-11-16 11:31:23 +01:00
atm-quentin
c18f486179
set facture to invoice AND check invoicenumber conf
2018-11-16 11:20:03 +01:00
atm-quentin
a8ab666d62
remplacement en masse des $conf->entity par des getEntity('facture')
2018-11-16 11:17:18 +01:00
Regis Houssin
aaa9a4f47c
FIX use getEntity('invoice') instead getEntity('facture')
2018-11-15 17:27:49 +01:00
Frédéric FRANCE
731d19a29b
add tooltip to butActionRefused
2018-11-13 21:40:17 +01:00
Laurent Destailleur
84983140b6
Merge pull request #9896 from hregis/develop_email
...
FIX change my deprecated email
2018-11-11 17:35:35 +01:00
Frédéric FRANCE
20acf440a3
Update api_products.class.php
2018-11-10 07:55:01 +01:00
Frédéric FRANCE
b271e1a3b0
The variable $i seems to be never defined.
2018-11-10 07:27:20 +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
f1193ad3dd
FIX: Missing date creation and modification of supplier price
2018-11-09 10:29:22 +01:00
Laurent BOUQUET
320e7adef7
Fix blank lines and whitespace at end of lines
2018-11-08 17:09:54 +01:00
Laurent BOUQUET
b03a91213f
Merge branch 'develop' into feature/product-search-barcode
2018-11-08 16:57:49 +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
Laurent Bouquet
f05b67909b
NEW : Add product search from barcode via REST api
2018-11-06 12:13:16 +01:00
Laurent Bouquet
cb10da4d41
[Core] Add product search from barcode via REST api
2018-11-05 23:06:19 +01:00
Laurent Destailleur
4a25317f10
Fix security on GETPOST('action'). Param must be sanitized.
2018-11-05 20:29:07 +01:00
Laurent Destailleur
c0f4ec5a3e
FIX sanitize param $action
2018-11-05 17:53:31 +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
6edaf3a422
Merge branch 'develop' into patch-9
2018-10-24 12:24:00 +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
2e0de15f95
Add public
2018-10-24 11:26:50 +02:00
Laurent Destailleur
f0743c55bb
Fix phpcs
2018-10-24 11:24:10 +02:00
Laurent Destailleur
1a4bb7ed12
FIX hover on line of movement list
2018-10-24 11:23:21 +02:00
Frédéric FRANCE
2a6478a2c4
fix phpcs
2018-10-24 08:15:00 +02:00
Laurent Destailleur
eaab953ba2
Renamed mouvement.php into movement_list.php to follow dev rules
2018-10-24 03:50:18 +02:00
Laurent Destailleur
01adaf253c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/product/list.php
2018-10-24 03:35:44 +02:00
Laurent Destailleur
c8aa884462
Fix search all
2018-10-23 17:16:46 +02:00
Juanjo Menent
e40ee879dc
New: works with variants:
...
- If product is variant disable prices modify
- Add function isVariant for knowing if product is a Variant
2018-10-23 13:07:09 +02:00
Laurent Destailleur
7bb5e7c31f
Fix responsive
2018-10-23 11:52:21 +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
Ferran Marcet
ffde353441
FIX When delete a product, llx_product_association rows are not deleted
2018-10-17 10:06:06 +02:00
Ferran Marcet
bdae4e1c4d
FIX When delete a product, llx_product_association rows are not deleted
2018-10-17 10:04:42 +02:00
Ferran Marcet
b462e7b217
FIX When delete a product, llx_product_association rows are not deleted
2018-10-17 10:01:02 +02:00
Laurent Destailleur
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
Philippe GRAND
729ff0b9bb
Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018
2018-10-16 14:20:11 +02:00
Juanjo Menent
194b3478f3
Merge remote-tracking branch 'upstream/develop' into develop
...
# Conflicts:
# htdocs/product/class/product.class.php
2018-10-15 13:40:42 +02:00
Laurent Destailleur
cca87f3d5a
Fix phpcs
2018-10-15 13:27:17 +02:00
Laurent Destailleur
6ab037c766
Fix code comment
2018-10-15 13:26:18 +02:00
Laurent Destailleur
f59dba66e7
Fix phpcs
2018-10-15 13:23:35 +02:00
Juanjo Menent
58cc9aa918
Fix: found 1 blank lines before brace
2018-10-15 12:45:40 +02:00
Juanjo Menent
c2814948fb
Fix: name of fields used into the search criteria must always start with "search_"
2018-10-15 11:48:55 +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
Laurent Destailleur
7e68d8df1b
Update product.class.php
2018-10-14 16:47:30 +02:00
Laurent Destailleur
5654492ba8
Update product.class.php
2018-10-14 16:45:45 +02:00
Laurent Destailleur
db2e1e09e7
Merge branch 'develop' into patch-112
2018-10-14 16:44:36 +02:00
Maxime Kohlhaas
d4d921b1cc
Add massaction generate on main lists
2018-10-14 16:27:59 +02:00
Laurent Destailleur
532e05c42e
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
2018-10-13 14:29:51 +02:00
atm-ph
7b17b453bf
Fix sort and switch page
2018-10-12 23:29:35 +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
Philippe GRAND
849a1a9400
Standardize and update code
2018-10-12 09:26:58 +02:00
atm-ph
79420593f4
Fix display 0 (as virtual stock) instead of empty string
2018-10-11 17:14:22 +02:00
Juanjo Menent
0976616401
Fix: Opening brace should be on a new line
2018-10-11 17:13:39 +02:00
Juanjo Menent
ab55ff2e2c
New: works with variants:
...
- Make the checkbox working correctly
2018-10-11 15:44:23 +02:00
Laurent Destailleur
e6f179b6cb
Fix look
2018-10-11 13:33:44 +02:00
Juanjo Menent
58be4ac7a3
New: works with variants:
...
- Hide child products into list if PRODUIT_ATTRIBUTES_HIDECHILD is activated
2018-10-11 12:36:10 +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
073ec85208
Standardize code
2018-10-05 15:51:08 +02:00
Philippe GRAND
da560289e3
Standardize code
2018-10-05 15:48:38 +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
Laurent Destailleur
75b1cac33f
FIX Pagination stats
2018-10-01 01:15:19 +02:00
Laurent Destailleur
d2e4752427
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-01 01:14:03 +02:00
Laurent Destailleur
d51eb1977a
FIX Pagination stats
2018-10-01 01:10:42 +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
Laurent Destailleur
d6ee00f2e7
Fix constructors does not need return value
2018-09-16 10:22:23 +02:00
Laurent Destailleur
bed8674714
Merge pull request #9519 from frederic34/patch-14
...
reduce complexity of libstatut inventory.class.php
2018-09-16 08:54:22 +02:00
Frédéric FRANCE
d2bd16280e
reduce complexity of libstatut inventory.class.php
2018-09-15 22:20:47 +02:00
Frédéric FRANCE
5d87847b65
reduce complexity of libstatut product.class.php
2018-09-15 22:13:54 +02:00
Frédéric FRANCE
987fdbe73c
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-12 21:29:41 +02:00
Frédéric FRANCE
ce76a2e714
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-12 20:21:35 +02:00
Frédéric FRANCE
a36f41728f
deprecate formbarcode:form_barcode_type
2018-09-10 23:58:57 +02:00
Frédéric FRANCE
312a606345
deprecate formbarcode:select_barcode_type
2018-09-10 23:50:48 +02:00
Frédéric FRANCE
f02b2f0239
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-09 13:35:58 +02:00
Frédéric FRANCE
a558c3bdac
replace select_date
2018-09-09 11:25:59 +02:00
Frédéric FRANCE
2b62c4ca8f
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-08 10:50:27 +02:00
Philippe GRAND
97c740f510
Merge branch 'develop' of github.com:grandoc/dolibarr into develop
2018-09-06 19:28:10 +02:00
Frédéric FRANCE
4cbfa2073a
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-05 21:02:16 +02:00
Laurent Destailleur
2a471df828
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-05 20:42:55 +02:00
Laurent Destailleur
ed31eec5ee
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-09-05 20:40:19 +02:00
Laurent Destailleur
dfea391c88
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/lib/pdf.lib.php
2018-09-05 20:39:38 +02:00
Laurent Destailleur
4ac67e6409
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-05 20:31:10 +02:00
Laurent Destailleur
19431a94ba
Code style
2018-09-05 14:37:44 +02:00
Laurent Destailleur
f7d5172a74
Merge pull request #9410 from frederic34/patch-10
...
Create index.html
2018-09-05 14:15:22 +02:00
Frédéric FRANCE
2015268b7e
Create index.html
2018-09-04 22:06:24 +02:00
Frédéric FRANCE
e4afd4af00
Create index.html
2018-09-04 22:05:06 +02:00
Frédéric FRANCE
65b74ad30f
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-04 20:48:35 +02:00
Philippe Grand
c32c67ca57
Merge branch 'develop' into develop
2018-09-04 16:58:59 +02:00
Philippe GRAND
47b6374abc
Standardize and update code
2018-09-04 13:45:20 +02:00
Philippe GRAND
42565e722e
Standardize and update code
2018-09-04 13:37:00 +02:00
Philippe GRAND
7a0c19485e
fix merge
2018-09-03 09:34:08 +02:00
Laurent Destailleur
bb5fae0e46
Fix eol
2018-09-02 15:30:56 +02:00
Frédéric FRANCE
2a5c994009
move phpcs:ignore
2018-09-02 14:01:37 +02:00
Frédéric FRANCE
04c1a7d4af
move phpcs:ignore
2018-09-02 13:38:11 +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
db32d8903e
Standardize and Update code
2018-09-01 23:20:20 +02:00
Philippe GRAND
7b0d3c32ab
Standardize and Update code
2018-09-01 22:55:10 +02:00
Philippe GRAND
5d273960dc
fix conflict
2018-09-01 22:40:38 +02:00
Laurent Destailleur
c8912d6a4f
Merge pull request #9242 from frederic34/camelCaps
...
mark non camelCaps function
2018-09-01 15:37:56 +02:00
Philippe GRAND
45cbc36a15
Standardize and update code
2018-09-01 15:27:55 +02:00
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
Philippe GRAND
17e349eba2
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2018-09-01 14:27:53 +02:00
Laurent Destailleur
5b6a44434c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-01 14:17:15 +02:00
Laurent Destailleur
bcee0ef0ae
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/dispatch.php
htdocs/societe/class/societe.class.php
htdocs/stripe/config.php
2018-09-01 14:16:57 +02:00
Laurent Destailleur
26cff9e11f
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/langs/en_US/blockedlog.lang
htdocs/stripe/config.php
2018-09-01 14:13:01 +02:00
Laurent Destailleur
123a66dc2a
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/product/class/product.class.php
2018-09-01 14:09:00 +02:00
Frédéric FRANCE
10200374ef
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-09-01 14:06:23 +02:00
Philippe GRAND
b59d49d3b3
Merge remote-tracking branch 'upstream/develop' into develop
2018-09-01 13:58:33 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-09-01 13:52:51 +02:00
Laurent Destailleur
b5ed4de6a6
Merge pull request #9367 from joseplluis/patch-4
...
FIX support of option PRODUCT_DISABLE_VOLUME
2018-09-01 13:37:38 +02:00
Philippe GRAND
d8e6492e93
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2018-09-01 13:07:30 +02:00
Laurent Destailleur
5604f3b0c3
Merge pull request #9376 from frederic34/functionCommentMissing
...
function Comment Missing
2018-09-01 12:59:32 +02:00
Philippe GRAND
1944ef0dc3
conflict resolution
2018-09-01 12:38:22 +02:00
Frédéric FRANCE
ebcf43ec73
function Comment Missing
2018-08-31 21:39:23 +02:00
Philippe GRAND
3a8bde227b
Standardize and update code
2018-08-31 19:26:08 +02:00
Philippe GRAND
bb05e80a87
Standardize and update code
2018-08-31 18:47:25 +02:00
Philippe GRAND
70ae8c6081
Standardize and update code
2018-08-31 18:27:16 +02:00
Philippe GRAND
2f307aae21
Standardize and update code
2018-08-31 18:06:17 +02:00
Josep Lluís
a514b97837
FIX: add global PRODUCT_DISABLE_VOLUME on create
...
On update and view the global PRODUCT_DISABLE_VOLUME is used.
But on create it does not exists.
2018-08-31 10:57:01 +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
5100b8b7b0
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-30 10:42:47 +02:00
atm-greg
f8fef61075
remove useless db begin
2018-08-30 09:19:44 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration
2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace
2018-08-29 21:25:22 +02:00
Laurent Destailleur
6ca9854a34
Fix to avoid fetch when no accounting account defined
2018-08-29 21:07:00 +02:00
Laurent Destailleur
3ebfb23407
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/product/fournisseurs.php
htdocs/ticket/class/ticket.class.php
2018-08-29 20:22:50 +02:00
Laurent Destailleur
d40e1a0d0b
FIX #9258
2018-08-29 20:12:38 +02:00
Frédéric FRANCE
cbdc669ba9
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-29 18:45:36 +02:00
Laurent Destailleur
ee204e2e64
Fix regression in php style
2018-08-29 15:37:35 +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
1842a4bb41
Merge pull request #9278 from grandoc/new_branch_21_08_2018
...
Update and standardize code
2018-08-28 02:13:28 +02:00
Laurent Destailleur
534eadb7a2
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-08-28 01:35:43 +02:00
Norbert Penel
f9c1dd8edd
There is a begin transaction without rollback
...
In this Select, there is no need of this Begin Transaction on my understanding.
Don't know why this line code is here for.
2018-08-28 01:32:55 +02:00
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
Norbert Penel
92b0668e3e
There is a begin transaction without rollback
...
In this Select, there is no need of this Begin Transaction on my understanding.
Don't know why this line code is here for.
2018-08-23 17:40:40 +02:00
Philippe GRAND
0c75c41e7b
Update and standardize code
2018-08-22 19:56:24 +02:00
Philippe GRAND
6542dcf0bd
Update and standardize code
2018-08-22 12:04:50 +02:00
Philippe GRAND
e0462b975b
Update and standardize code
2018-08-22 11:48:26 +02:00
Philippe GRAND
0ffad50974
Update and standardize code
2018-08-22 11:24:31 +02:00
Philippe GRAND
a36061079b
Update and standardize code
2018-08-22 11:11:59 +02:00
Philippe GRAND
a669830427
Update and standardize code
2018-08-22 10:37:16 +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
c76a33fb4f
remove superfluous spaces
2018-08-21 20:12:27 +02:00
Frédéric FRANCE
0fbccce9a7
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-21 19:59:07 +02:00
Laurent Destailleur
db3c17668e
Fix coding style
2018-08-21 19:08:11 +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
Laurent Destailleur
b40e32b8c3
Merge pull request #9264 from grandoc/new_branch_17_08_2018
...
standardize code
2018-08-21 12:52:34 +02:00
Laurent Destailleur
c25a968c72
Update list.php
2018-08-21 12:15:47 +02:00
Laurent Destailleur
a10b4da6ac
Update list.php
2018-08-21 12:13:07 +02:00
Laurent Destailleur
a73d2447d9
Update list.php
2018-08-21 12:10:05 +02:00
ptibogxiv
d5aed3394d
fix duration display for service in list.php
2018-08-20 09:52:59 +02:00
Philippe GRAND
c48211ad70
Update and standardize code
2018-08-17 19:31:22 +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
Laurent Destailleur
3b245f1b30
Merge pull request #9247 from frederic34/missingReturn
...
return comment
2018-08-16 00:35:39 +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
5146ab9177
trim
2018-08-14 15:34:44 +02:00
Frédéric FRANCE
a0a6afc224
return comment
2018-08-14 12:23:10 +02:00
Frédéric FRANCE
3210181a3d
rule for private function is different
2018-08-14 10:21:34 +02:00
Philippe GRAND
e35da2f84d
Standardize code
2018-08-14 09:55:58 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function
2018-08-13 17:26:32 +02:00
Frédéric FRANCE
82e8efe792
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-12 20:14:14 +02:00
Laurent Destailleur
9fc5d39d07
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-12 20:09:36 +02:00
Laurent Destailleur
dc8c4402ee
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-12 20:09:22 +02:00
Laurent Destailleur
0a1c6e7194
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/compta/facture/list.php
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
2018-08-12 20:08:20 +02:00
Frédéric FRANCE
62db9a4022
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-12 19:54:03 +02:00
Laurent Destailleur
30b4d88428
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/product/reassort.php
htdocs/societe/list.php
2018-08-12 19:23:45 +02:00
Laurent Destailleur
1b20d6feab
Merge pull request #9214 from atm-greg/Add_supplier_product_description
...
NEW Can record the supplier product description
2018-08-12 18:56:27 +02:00
Frédéric FRANCE
6f74ecceaf
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-12 18:21:59 +02:00
Laurent Destailleur
12e21b4886
FIX update extrafields
2018-08-12 16:29:26 +02:00
Frédéric FRANCE
b00164ca39
test phpcs v3
2018-08-09 11:03:50 +02:00
Frédéric FRANCE
5f4d54ede5
correct space
2018-08-07 17:17:58 +02:00
Frédéric FRANCE
9025c452ef
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-07 16:40:03 +02:00
atm-greg
294045daed
update description without multicurrency
2018-08-07 10:16:04 +02:00
atm-greg
ad5f59822e
Merge branch 'develop' of github.com:Dolibarr/dolibarr into Add_supplier_product_description
2018-08-07 09:33:30 +02:00
atm-greg
fc705e8510
Merge branch '8.0' of github.com:Dolibarr/dolibarr into Add_supplier_product_description
2018-08-07 09:31:41 +02:00
atm-greg
08273612d9
create field without migration
2018-08-06 17:21:20 +02:00
atm-greg
a8b33a1710
New fields desc_supplier on product_fourn_prices
2018-08-06 16:26:25 +02:00
Philippe GRAND
948647f3f9
comment translation
2018-08-04 14:17:51 +02:00
Juanjo Menent
37a9a2df56
Merge pull request #9167 from frederic34/include
...
Include and co are statements
2018-08-02 11:03:44 +02:00
Frédéric FRANCE
7dada7ae8e
fix #8820
2018-07-29 09:15:42 +02:00
Frédéric FRANCE
6cb0fb10d6
trim trailing
2018-07-26 19:05:34 +02:00
Frédéric FRANCE
a0a5d33641
test include
2018-07-26 17:30:53 +02:00
Philippe GRAND
efa6ad0659
Clean and update code
2018-07-25 19:05:40 +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
Philippe GRAND
74704acbcb
clean and update code
2018-07-18 16:13:13 +02:00
Laurent Destailleur
19bb8a5091
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/accountancy.lang
2018-07-18 14:12:28 +02:00
Laurent Destailleur
33d67ea332
Fix ref on list
2018-07-18 14:09:44 +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
20e360e918
Start to introduce array fields for products
2018-07-15 18:22:26 +02:00
Laurent Destailleur
e4be3ab954
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-13 09:09:51 +02:00
Laurent Destailleur
52dee71b39
Responsive
2018-07-12 18:06:06 +02:00
Laurent Destailleur
6eb9f13ec2
Fix warning
2018-07-11 10:01: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
Laurent Destailleur
d5cb2fc4cd
Update productcustomerprice.class.php
2018-07-09 17:04:50 +02:00
Laurent Destailleur
551e2efe86
Update productcustomerprice.class.php
2018-07-09 17:03:55 +02:00
Regis Houssin
e8afd7e833
Fix: use "supplier" instead "reseller"
2018-07-07 08:48:26 +02:00
Regis Houssin
1522a5b22d
Fix: differentiate customer prices from supplier prices sharing
2018-07-07 08:43:59 +02:00
Philippe GRAND
1e565486d8
fix : typo and update code
2018-07-06 19:17:11 +02:00
Laurent Destailleur
45d1a14c8e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-06 16:10:37 +02:00
Laurent Destailleur
4db7e04523
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/class/html.formactions.class.php
htdocs/loan/index.php
2018-07-06 16:09:32 +02:00
Laurent Destailleur
2cdd9adc6e
Merge pull request #9023 from atm-maxime/fix_stocklist
...
Fix filters not saved when ordering
2018-07-06 14:23:10 +02:00
Laurent Destailleur
fb84211714
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-06 12:45:44 +02:00
Laurent Destailleur
b369585e61
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/product/stats/commande.php
htdocs/product/stats/commande_fournisseur.php
htdocs/product/stats/contrat.php
htdocs/product/stats/facture.php
htdocs/product/stats/facture_fournisseur.php
htdocs/product/stats/propal.php
htdocs/product/stats/supplier_proposal.php
2018-07-05 15:57:27 +02:00
Laurent Destailleur
0587e73272
FIX Pagination on related item pages
2018-07-05 15:53:28 +02:00
Laurent Destailleur
d8c7c61951
Merge branch '8.0_canvas' of https://github.com/hregis/dolibarr into
...
hregis-8.0_canvas
# Conflicts:
# htdocs/product/canvas/product/tpl/list.tpl.php
2018-06-30 18:29:08 +02:00
Laurent Destailleur
982a1ffbaf
NEW Automatic position of scroll when creating an extrafield
2018-06-30 14:22:05 +02:00
Regis Houssin
f3d213bab8
Fix: remove old code
2018-06-30 11:05:13 +02:00
Regis Houssin
debec3d175
Fix: remove old code of canvas
...
Conflicts:
htdocs/product/list.php
2018-06-30 11:03:02 +02:00
Regis Houssin
62a55e10b7
Fix: remove not used list template
2018-06-30 10:58:28 +02:00
Regis Houssin
718cbce8eb
Fix: use "visible" field name instead "checked"
2018-06-30 10:58:08 +02:00
Regis Houssin
96faf7cb0f
Fix: use the new title
2018-06-30 10:55:15 +02:00
Regis Houssin
5b491a4d57
Fix: remove duplicate code
2018-06-30 10:55:01 +02:00
Regis Houssin
ebfd1846a3
Fix: add new field "checked"
2018-06-30 10:54:46 +02:00
Regis Houssin
3a26443546
Fix: remove unused code
...
Conflicts:
htdocs/product/list.php
2018-06-30 10:53:40 +02:00
Regis Houssin
e392610f46
Fix: missing banner
2018-06-30 10:52:51 +02:00
Regis Houssin
f998f64db0
Works on use new list engine instead template for canvas
...
Conflicts:
htdocs/product/list.php
2018-06-30 10:52:26 +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
Laurent Destailleur
a850e91bcb
Merge pull request #9017 from grandoc/new_branch_27_06_2018
...
clean and update code
2018-06-29 19:41:22 +02:00
Maxime Kohlhaas
3babdb9798
Fix filters not saved when ordering
2018-06-28 13:45:30 +02:00
Laurent Destailleur
da138db528
FIX combo into popup become crazy with IE10
...
Conflicts:
htdocs/asset/card.php
htdocs/modulebuilder/template/myobject_card.php
2018-06-28 12:16:12 +02:00
Laurent Destailleur
3ea2d81279
FIX combo into popup become crazy with IE10
2018-06-28 12:05:02 +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
36402c22ee
FIX SQL Injections reported by mu shcor (ADLab of Venustech)
2018-06-25 14:06:09 +02:00
Laurent Destailleur
e9b4141dd9
Fix syntax error
2018-06-23 17:11:19 +02:00
Laurent Destailleur
2db2ea3627
Fix colspan
2018-06-23 15:13:39 +02:00
Laurent Destailleur
dbb90e80a3
Fix syntax error
2018-06-23 12:57:41 +02:00
Laurent Destailleur
eb88f1e5c9
Fix look and feel v8
2018-06-23 12:41:03 +02:00
Laurent Destailleur
be2309c70f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-06-22 22:54:11 +02:00
Laurent Destailleur
27a27e02a1
Fix css
2018-06-22 22:53:53 +02:00
Laurent Destailleur
02fbe4a84c
Merge pull request #8991 from hregis/develop_product
...
Fix: avoid Warning: A non-numeric value encountered
2018-06-22 15:52:05 +02:00
Laurent Destailleur
6f1101a2d6
Update card.php
2018-06-22 15:51:26 +02:00
Laurent Destailleur
1bf0432a72
Merge pull request #8997 from ptibogxiv/patch-29
...
add minute to duration services
2018-06-22 15:12:57 +02:00
Laurent Destailleur
0f80508be1
Fix canvas on list is a feature going in the wall so i clean this.
2018-06-22 14:51:47 +02:00
ptibogxiv
a6151ee11e
add minute to duration services
...
add minute for duration description (more compliant thant 0,166667h for billing services by minute
2018-06-20 12:10:25 +02:00
Regis Houssin
b9fe6f8624
Fix: avoid warning
2018-06-19 19:00:23 +02:00
Regis Houssin
2c927dba01
Fix: wrong var name "shownav"
2018-06-19 18:33:22 +02:00
Regis Houssin
b9893bde1d
Fix: avoid Warning: A non-numeric value encountered
2018-06-19 18:26:37 +02:00
atm-greg
df056980b5
fix bad result on fetch ProductStockEntrepot
2018-06-19 10:46:07 +02:00
Laurent Destailleur
edd7499375
Fix clone with new architecture
2018-06-19 09:21:23 +02:00
Laurent Destailleur
5b019eb985
Merge pull request #8982 from hregis/7.0_bug6
...
Fix: "libelle" is deprecated, use "label" instead
2018-06-18 14:32:35 +02:00
Regis Houssin
54a333c374
Fix: use label instead libelle
2018-06-18 13:54:14 +02:00
Regis Houssin
494d6dcfef
Fix: libelle is deprecated, use label instead
2018-06-18 13:50:58 +02:00
atm-greg
2cdae2ec98
remove globalcard context
2018-06-18 11:30:38 +02:00
Laurent Destailleur
7981bd08b7
Fix price+sql error when adding product when no supplier price defined
2018-06-16 14:47:33 +02:00
atm-greg
72449ddef4
add hooks on stock replenish
2018-06-15 16:55:23 +02:00
Laurent Destailleur
910652eb6d
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/langs/en_US/admin.lang
2018-06-13 23:07:30 +02:00
Laurent Destailleur
4a5fd35e11
Look and feel v8
2018-06-13 22:57:41 +02:00
fappels
a86c90fed1
Fix Wrong error for duplicate ref if barcode enabled but not set.
2018-06-12 16:38:42 +02:00
fappels
141d19571c
Add modify trigger to barcode modify.
2018-06-06 17:11:34 +02:00
Laurent Destailleur
eaee252a5d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-06-04 12:56:12 +02:00
Laurent Destailleur
29ee5dffc4
Clean code
2018-06-04 12:55:55 +02:00
fappels
e0f9605483
Fix add missing properties for trigger
2018-06-03 11:05:02 +02:00
Laurent Destailleur
be2c49d490
Fix log
2018-06-01 17:39:07 +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
Laurent Destailleur
cf5f7bf06d
Update price.php
2018-05-29 10:52:55 +02:00
Laurent Destailleur
f473607249
Merge branch 'develop' into patch-15
2018-05-29 10:49:28 +02:00
wdammak
9ec6387a63
Add movement generateDocument function (mode dev)
2018-05-28 05:21:53 +01:00
Frédéric FRANCE
022d457284
loadlangs
2018-05-27 00:06:49 +02:00
Frédéric FRANCE
d986909109
loadlangs
2018-05-26 23:52:52 +02:00
Frédéric FRANCE
58e5715ac3
loadlangs
2018-05-26 17:57:30 +02:00
Frédéric FRANCE
a487cf6806
Update price.php
2018-05-26 15:15:38 +02:00
jean
fb96857b73
use dayhour instead of % format
2018-05-25 15:33:27 +02:00
jean
eb39e5746e
Merge remote-tracking branch 'origin/develop' into dev_datepricefour
2018-05-25 15:32:15 +02:00
Laurent Destailleur
823936ef87
Merge pull request #8847 from frederic34/multipriceqty
...
NEW Finish implementation of option PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES
2018-05-25 12:55:02 +02:00
Laurent Destailleur
9d407cdc03
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-25 11:27:04 +02:00
Laurent Destailleur
0e6aa3def3
Fix duplicate deprecated file
2018-05-25 11:26:50 +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
Frédéric FRANCE
0623ff7667
fix logic
2018-05-24 11:56:19 +02:00
Frédéric FRANCE
8547827575
Merge remote-tracking branch 'upstream/develop' into multipriceqty
2018-05-23 17:06:02 +02:00
Frédéric FRANCE
efbb053e54
PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES
2018-05-23 17:05:08 +02:00
All3kcis
4bfd8b5539
Add oldcopy on productlot::update()
2018-05-23 10:38:24 +02:00
jean
1ab5eece6b
Adding code to show update date of supplier price shown
2018-05-22 09:40:49 +02:00
Laurent Destailleur
de84f0e687
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/core/actions_massactions.inc.php
htdocs/filefunc.inc.php
2018-05-21 23:35:09 +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
Laurent Destailleur
b5f37b2876
Merge pull request #8811 from fappels/7.0_fix_product_vat_update_errorhandling
...
Fix product vat update error handling
2018-05-18 12:00:03 +02:00
fappels
90d2ccc79c
Fix product vat update error handling
...
Product vat update does not show update error if update result negative.
2018-05-17 21:29:15 +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
BENKE Charlene
8ed3b3e49c
Update product.class.php
2018-05-06 22:12:43 +02:00
BENKE Charlene
70c9ed960d
let's play with hook
2018-05-06 22:11:24 +02:00
Laurent Destailleur
546da0ceda
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/core/modules/modStock.class.php
htdocs/product/inventory/list.php
2018-05-05 14:40:39 +02:00
Laurent Destailleur
44cb60e61d
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-05-05 13:25:00 +02:00
Laurent Destailleur
f6ca1eb624
Fix permission name
2018-05-05 13:24:46 +02:00
Laurent Destailleur
634e58b7c9
Look and feel v8
2018-05-04 18:24:00 +02:00
fappels
db76fd7895
Fix delete all product variants of a parent product
...
User object missing
2018-05-02 22:33:23 +02:00
BENKE Charlene
5ac0f77d0e
Add trigger for virtual stock
...
Allow to add/sustract some qty for GPAO OF running
2018-05-02 17:29:31 +02:00
Laurent Destailleur
0cdfd6800a
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-29 20:11:47 +02:00
Laurent Destailleur
aafab12f4b
Debug API for ticket module
2018-04-29 18:06:31 +02:00
Laurent Destailleur
19d15c79dd
Merge pull request #8673 from frederic34/variantonservice
...
NEW Module variant supported on services
2018-04-27 10:01:28 +02:00
Laurent Destailleur
90723357c4
Look and feel v8
2018-04-24 13:50:05 +02: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
Frédéric FRANCE
5f4e2dc565
variant on services
2018-04-24 11:01:17 +02:00
Frédéric FRANCE
657fa48c3f
Update api_products.class.php
2018-04-23 15:31:55 +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
fec9303d18
Remove useless $var
2018-04-22 18:51:03 +02:00
Laurent Destailleur
411949a6bb
Optimize constructors
2018-04-21 15:08:46 +02:00
Laurent Destailleur
394b988a4e
FIX key in getEntity for supplier proposals
2018-04-21 14:41:31 +02:00
Laurent Destailleur
ccd9aa8059
Fight against dolibarr warnings
2018-04-21 12:16:12 +02:00
Laurent Destailleur
c30b0da07d
Clean code
2018-04-21 12:12:46 +02:00
Laurent Destailleur
cef9782179
Clean defined constant at begin of pages
2018-04-21 12:00:55 +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
2959dc4a3a
Fix regression
2018-04-15 18:20:04 +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
Laurent Destailleur
be965bdbab
Clean code
2018-04-13 13:28:48 +02:00
Laurent Destailleur
fbae4429b7
Clean code for better extrafields management
2018-04-13 12:52:23 +02:00
Laurent Destailleur
1521b0595b
Clean code
2018-04-13 11:03:03 +02:00
Laurent Destailleur
6e288fca75
Merge pull request #8575 from all3kcis/develop-patch-16
...
NEW Add files management on products lot
2018-04-13 00:57:13 +02:00
Laurent Destailleur
341d1efb11
Fix clear filter must not lose type
2018-04-12 23:42:06 +02:00
Laurent Destailleur
3cecfd02c7
NEW Mutualize code for action="update_extras"
...
NEW Can use setValueFrom without user modification field
FIX Exclude separators from mandatory extrafields test
More code to use the new framework array for extrafields
Can use text condition in extrafield visibility
2018-04-12 23:16:23 +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
880fa55dd5
display user-friendly filesize
2018-04-12 15:29:22 +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
7d7c0624d2
Update traduction.php
2018-04-11 12:59:24 +02:00
Laurent Destailleur
eeb2580f32
Fix foreign key error
2018-04-10 22:23:21 +02:00
atm-quentin
809b2a91ed
FIX issue #8037
2018-04-10 16:27:18 +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
ff411ed2e5
NEW Add accounting account number on product tooltip
2018-04-08 23:54:04 +02:00
Laurent Destailleur
58bc3e5e74
FIX Ref of supplier invoice in stats page
2018-04-08 23:38:54 +02:00
Laurent Destailleur
d46a8eb8f0
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/company.php
2018-04-07 12:30:30 +02:00
Laurent Destailleur
723ac6fba0
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-04-06 00:02:06 +02:00
Laurent Destailleur
6c409b2670
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-05 18:08:19 +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
Laurent Destailleur
55719cd166
Update card.php
2018-04-05 16:20:50 +02:00
Laurent Destailleur
7c70f9ed03
Fix option STOCK_SUPPORTS_SERVICES
2018-04-03 20:23:47 +02:00
Maxime Kohlhaas
0c3b92f09a
Better fix
2018-04-03 14:53:57 +02:00
Maxime Kohlhaas
39eab6d88d
Fix service creation, right is tested regarding the product type
2018-04-03 14:38:20 +02:00
Regis Houssin
9f7fcdc8bf
Fix: multiple avoid Warning and errors
2018-04-02 10:18:51 +02:00
Laurent Destailleur
a9ac7e1f29
Debug inventory module
2018-03-31 19:20:38 +02:00
Laurent Destailleur
43f8834b28
Uniformize code with the new module builder framework
2018-03-31 18:48:27 +02:00
Laurent Destailleur
f5079276fb
Fix use new extrafield array definition.
...
Fix exclude separator from list of fields in lists
2018-03-31 17:52:31 +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
Laurent Destailleur
72cedcf9f3
Removed method fetch_prods() and get_each_prod() not used, keep only
...
get_arbo_each_prod() that is better.
2018-03-22 18:01:06 +01:00
Laurent Destailleur
9980a5fbd0
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
2018-03-22 14:08:43 +01:00
Laurent Destailleur
700c69e127
NEW Can set position of images in module tickets
...
Mutualize code of method show_photo
2018-03-22 11:46:35 +01:00
fappels
3765bc4775
Fix html escape for edit label
2018-03-22 10:48:03 +01:00
fappels
9e4a66b1a9
Fix hidden oprion PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION
2018-03-22 10:46:54 +01: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
All3kcis
1c0fdcda7a
Add status batch for getNomUrl
2018-03-16 13:57:02 +01:00
All3kcis
fd275a636c
Add batch status
...
Add batch status, for correct display with getNomUrl
2018-03-16 11:45:46 +01:00
Laurent Destailleur
c962b89495
NEW hook getnomurltooltip is replaced with hook getNomUrl more powerfull
2018-03-15 20:46:55 +01:00
Laurent Destailleur
302fed8646
More fa image to replace png picto
2018-03-14 20:08:44 +01:00
Laurent Destailleur
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
Laurent Destailleur
43e297b142
Merge pull request #8138 from frederic34/patch-2
...
Update price.php
2018-03-11 18:33:16 +01:00
Laurent Destailleur
64f21b8a3c
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/card.php
2018-03-11 00:10:13 +01:00
Laurent Destailleur
6c9e0e1752
Merge branch '7.0' into 7.0
2018-03-10 21:52:57 +01:00
Laurent Destailleur
905cf112e9
Merge pull request #8327 from tiaris/fix7.0
...
FIX #8289
2018-03-10 18:58:22 +01:00
Laurent Destailleur
6fcc271790
Update product.class.php
2018-03-10 18:57:55 +01:00
Laurent Destailleur
aea3c164ba
Merge pull request #8178 from hregis/7.0_bug2
...
Fix: avoid Warning: A non-numeric value encountered
2018-03-10 18:47:11 +01:00
BadPixxel
44d18027f2
BugFix for PHP7.1: PHP Warning: A non-numeric value encountered in /tmp/Dolibarr/htdocs/product/class/product.class.php on line 1709
2018-03-10 15:48:40 +01:00
jean
6793bfae3a
FIX #8289 add a cofoiguration for correct stopck calculation
2018-03-10 14:17:52 +01:00
Laurent Destailleur
212536a3fd
Update list.php
2018-03-10 12:54:20 +01:00
Laurent Destailleur
64f2f324de
Update card.php
2018-03-10 12:52:09 +01:00
Laurent Destailleur
a7f82af352
Update card.php
2018-03-10 12:49:25 +01:00
Maxime Kohlhaas
fd36ade61a
Fix unit in replenish #7225
2018-03-10 11:20:32 +01:00
florian HENRY
1c966d4769
on going
2018-03-09 12:57:58 +01:00
Laurent Destailleur
62a339e582
Minor fix in multicurrency for supplier prices
2018-03-07 14:13:46 +01:00
Laurent Destailleur
cf45f78d7e
Merge pull request #8218 from OPEN-DSI/product_supplier_buyprice_multicurrency
...
NEW Add multicurrency support for product buy price for supplier propales, orders and invoices
2018-03-07 13:12:23 +01:00
Laurent Destailleur
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
Laurent Destailleur
0e7a250060
Fix colspan
2018-03-01 11:53:18 +01:00
Laurent Destailleur
3c903675f2
Fix colspan
2018-02-28 15:29:52 +01:00
Laurent Destailleur
5ef7bee030
Use combo for selection of categories into virtual product edition
2018-02-28 15:27:21 +01:00
Laurent Destailleur
04934cc4aa
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/lib/functions.lib.php
htdocs/projet/tasks/time.php
2018-02-27 19:18:43 +01:00
Laurent Destailleur
6bec121c9f
Use name of var
2018-02-27 13:26:57 +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
19ae24f693
Code comment
2018-02-26 21:03:52 +01:00
kkhelifa-opendsi
90f4c985f6
Merge branch 'develop' into product_supplier_buyprice_multicurrency
2018-02-26 09:54:09 +01:00
Laurent Destailleur
41638e6dff
Fix back link of look and feel v7
2018-02-26 09:20:05 +01:00
Laurent Destailleur
003827eb06
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-25 15:01:19 +01:00
Laurent Destailleur
2cd5ed65a6
Clean deprecated (field unit_charge in supplier price)
2018-02-25 14:13:09 +01:00
Regis Houssin
b216249214
Fix: missing hook parameters
2018-02-24 15:01:29 +01:00
Laurent Destailleur
0a79550f43
Fix oldcopy must be saved before update_extras
2018-02-23 16:11:00 +01:00
KHELIFA
54dba24ab5
Add multicurrency support for product buy price for supplier propales, orders and invoices
2018-02-23 11:06:07 +01:00
Laurent Destailleur
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
6b74c79798
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/website.lang
2018-02-15 15:34:17 +01:00
Laurent Destailleur
f0855da0fb
Fix responsive
2018-02-15 12:57:04 +01:00
Laurent Destailleur
f1a9f81fb4
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/website.lang
2018-02-14 22:19:59 +01:00
Laurent Destailleur
7f8cbc0f62
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/adherents/type.php
htdocs/contrat/services.php
htdocs/contrat/tpl/linkedobjectblock.tpl.php
htdocs/install/upgrade2.php
2018-02-14 22:08:18 +01:00
Laurent Destailleur
23ee6748f7
Update fournisseurs.php
2018-02-14 20:36:13 +01:00
Laurent Destailleur
4f369bd746
NEW Can force usage of shared link for photo of products
2018-02-13 16:34:43 +01:00
Laurent Destailleur
36ac380cac
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-12 22:26:48 +01:00
Laurent Destailleur
00a8be22a2
Fix field too small
2018-02-12 22:11:43 +01:00
Regis Houssin
24cc687724
Fix: you can't check "fournisseur" with checkUserAccessToObject without
...
object ID
2018-02-12 09:28:41 +01:00
Regis Houssin
40fe3849dc
Fix: avoid Warning: A non-numeric value encountered
2018-02-12 08:21:35 +01:00
Laurent Destailleur
6bdb82cf27
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/societe/class/api_thirdparties.class.php
2018-02-12 04:15:47 +01:00
Laurent Destailleur
7f4adb7f97
Update card.php
2018-02-12 03:23:57 +01:00
Regis Houssin
3525306cc4
Fix: wrong var name
2018-02-11 13:29:37 +01:00
Regis Houssin
86df1ddd0a
Fix: uniformize user rights check
2018-02-11 13:27:02 +01:00
Regis Houssin
01b3b8e09e
Fix: check perms by type of product
2018-02-11 12:09:12 +01:00
Laurent Destailleur
eccdc9a075
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/langs/pt_PT/companies.lang
2018-02-08 15:20:24 +01:00
Laurent Destailleur
03b10041db
Fix missing contextpage
2018-02-08 13:27:43 +01:00
Frédéric FRANCE
9f7496ce04
Update price.php
2018-02-05 17:47:29 +01:00
Laurent Destailleur
fe57cf697f
Fix init category selected
2018-02-04 14:35:38 +01:00
Laurent Destailleur
ec15048964
Fix init category selected
2018-02-04 14:34:31 +01:00
Laurent Destailleur
fae7616281
Fix update price when updating products
2018-02-01 21:20:54 +01:00
Laurent Destailleur
e79f6fda2b
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-01-26 01:23:18 +01:00
Laurent Destailleur
2c0eeaf8de
FIX #8093
2018-01-25 20:57:51 +01:00
Laurent Destailleur
39c4df723a
Fix error management when setting product accounts
2018-01-22 21:07:10 +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
3c3402bc60
Debug API for prices of products
2018-01-14 15:58:04 +01:00
Laurent Destailleur
8b972313ae
Fix scrutinizer
2018-01-12 15:38:53 +01:00
Laurent Destailleur
f0a10cdcc1
Missing backlink
2018-01-12 10:32:48 +01:00
Laurent Destailleur
af6b84ba3a
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/contact/document.php
htdocs/product/list.php
2018-01-11 01:03:13 +01:00
Laurent Destailleur
9827358002
Merge pull request #8040 from atm-florian/dev_fixsecu
...
fix #7963
2018-01-11 00:44:45 +01:00
Laurent Destailleur
4747e84b74
Update price.php
2018-01-11 00:40:33 +01:00
Laurent Destailleur
b5fe953a64
Merge pull request #8035 from pdermody/6.0
...
Fix #8034 - Surface and volume units are calculated incorrectly
2018-01-11 00:36:00 +01:00
HENRY Florian
5af39e80e0
Update price.php
2018-01-10 20:38:06 +01:00
Laurent Destailleur
43d560830c
Fix on old php
2018-01-10 13:20:43 +01:00
florian HENRY
fdedd6f75b
fix 7963
2018-01-08 20:54:40 +01:00
Paul Dermody
a1ac285a25
Fixed automated computation of surface and volume to use correct units. It was failing for inches and feet.
2018-01-07 12:42:14 -06:00
Laurent Destailleur
301f509611
Merge pull request #8019 from atm-gauthier/6.0_fix_vat_mass_update
...
FIX : $oldvatrateclean & $newvatrateclean must be set if preg_match === false
2018-01-04 21:03:20 +01:00
Laurent Destailleur
e4d37c3e23
Merge pull request #8012 from ATM-Nicolas/fix_product_best_price
...
Fix product best price
2018-01-04 20:58:59 +01:00
gauthier
58470e0913
FIX : $oldvatrateclean & $newvatrateclean must be set if preg_match === false
2018-01-04 12:01:21 +01:00
Laurent Destailleur
c7798d11ce
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2018-01-03 20:13:17 +01:00
ATM-Nicolas
2e6c036ad8
Merge branch '6.0' of github.com:Dolibarr/dolibarr into fix_product_best_price
2018-01-02 17:22:53 +01:00
ATM-Nicolas
61efda4cbd
FIX : product best price on product list
2018-01-02 17:21:04 +01:00
Laurent Destailleur
644e8b5a05
Fix navigation on stock
2017-12-24 15:02:15 +01:00
Laurent Destailleur
e6c7f9e69b
Debug module inventory
2017-12-22 21:29:09 +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
2b056b0177
BUG Fix of old hidden feature price per quantity
2017-12-22 12:53:46 +01:00
Laurent Destailleur
27a9a81f99
Fix link to contracts
2017-12-21 23:48:33 +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
Frédéric FRANCE
ab558ee5fa
Update product.php
2017-12-14 09:49:55 +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
f85e79e250
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/filefunc.inc.php
htdocs/holiday/class/holiday.class.php
2017-12-08 13:13:53 +01:00
Laurent Destailleur
8dc3d7323d
Merge pull request #7923 from fmarcet/6.0
...
FIX #7379 : Compatibility with PRODUCT_USE_OLD_PATH_FOR_PHOTO varieable
2017-12-08 13:02:07 +01:00
Laurent Destailleur
9b9b5adf66
Fix must be compatible with old and new storage location
2017-12-08 13:01:45 +01:00
Laurent Destailleur
08abb1490a
Remove code using not defined var
2017-12-08 12:54:08 +01:00
Ferran Marcet
bfc476a118
FIX #7379 : Compatibility with PRODUCT_USE_OLD_PATH_FOR_PHOTO varieable
2017-12-07 18:44:33 +01:00
Ion
669e080670
More informative error message in dynamics price
2017-12-06 14:51:29 +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
e8327fd9a1
Fix the eatby/sellby date was not visible.
2017-12-02 10:43:01 +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
4969ae2abb
Fix missing the badge on virtual product tab
2017-12-01 17:48:51 +01:00
Laurent Destailleur
a832bbb348
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/compta/facture/stats/index.php
2017-12-01 16:18:03 +01:00
Laurent Destailleur
471f99c24c
Fix look and feel v7
2017-12-01 15:58:35 +01:00
Laurent Destailleur
46b015d205
Fix usage of option STOCK_SUPPORTS_SERVICES
2017-12-01 13:40:24 +01:00
Laurent Destailleur
a0231b5c60
Fix responsive
2017-12-01 12:55:28 +01:00
root
b7f26ea788
FIX add line bad price and ref
2017-11-30 11:10:01 +01:00
Laurent Destailleur
c1e6d35ca5
Merge pull request #7878 from atm-florian/dev_informize_extrafield_list_search
...
factorization of extrafields into list
2017-11-28 12:14:47 +01:00
florian HENRY
94285ae494
factorization of extrafeild into list
2017-11-27 15:24:29 +01:00
Scrutinizer Auto-Fixer
aab2799981
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-11-27 13:48:36 +00:00
Laurent Destailleur
ffe2be377c
Fix navigation
2017-11-26 20:43:37 +01:00
Laurent Destailleur
a0406bc741
Standardize view of events for products
2017-11-26 20:24:20 +01:00
Laurent Destailleur
ae906270f3
Debug module variant
2017-11-26 18:43:43 +01:00
Laurent Destailleur
77509ee37a
Removed deprecated apis
2017-11-25 13:14:28 +01:00
Laurent Destailleur
aaf08ade2f
Fix bug reported by scrutinizer
2017-11-25 11:21:31 +01:00
Laurent Destailleur
831099fef8
Debug modulebuilder
2017-11-24 16:24:42 +01:00
Laurent Destailleur
5ee85821fc
Debug modulebuilder
2017-11-24 15:47:38 +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
9c22b5f335
Replace deprecated dol_print_graph with DolGraph
2017-11-23 20:24:05 +01:00
Laurent Destailleur
b93e35cdd2
Fix a lot of request to use the IN getentity instead of =
...
Fix a lot of request to use left join on type of payment table
2017-11-23 15:06:16 +01:00
Laurent Destailleur
405275693f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/replenishorders.php
htdocs/projet/activity/perday.php
2017-11-17 14:20:08 +01:00
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
c85acbfc11
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/fiche-rec.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/import/import_xlsx.modules.php
htdocs/install/repair.php
2017-11-14 19:47:33 +01:00
florian HENRY
e195cf0b95
fix : return vat code for supplier price
2017-11-14 09:53:06 +01:00
Laurent Destailleur
b5196b7164
FIX A lot of several fix on local taxes and NPR tax
2017-11-13 14:24:40 +01:00
Laurent Destailleur
955ed7dbbf
NEW Show the supplier ref into supplier cards
2017-11-12 15:30:21 +01:00
Laurent Destailleur
186c8cdbf0
Fix selection of contact into creation of event
2017-11-12 13:40:05 +01:00
Laurent Destailleur
836f6bf3c9
Fix search filter when using extrafields 'links'
2017-11-12 12:39:23 +01:00
Laurent Destailleur
7e1e710d28
Merge pull request #7796 from IonAgorria/fix-price-dynamic
...
Fix: price dynamic bugs
2017-11-11 17:49:00 +01:00
Laurent Destailleur
d1860b87f8
NEW Add a confirmation for all mass action 'delete'
2017-11-11 16:34:11 +01:00
Ion
cb463d186a
Error when fetching empty expression
2017-11-10 12:32:54 +01:00
Ion
fdf260a1da
Use __METHOD__ on dynamic prices syslog
2017-11-10 12:32:54 +01:00
Ion
f642289160
Add missing arg in supplier min price
2017-11-10 12:32:49 +01:00
Ion Agorria
aa0b811f73
Undefined variable detection in price parser
2017-11-09 17:12:55 +01:00
Ion
e528a82051
Remove price dynamic internal var
2017-11-09 17:12:55 +01:00
Laurent Destailleur
e7abc92f97
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/transfer.php
htdocs/core/lib/functions.lib.php
2017-11-06 21:37:19 +01:00
Laurent Destailleur
6eb2204c2b
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
htdocs/product/list.php
2017-11-06 21:20:06 +01:00
Laurent Destailleur
34bd785785
Prepre 7.0 (not stable code hidden)
2017-11-06 09:30:30 +01:00
Laurent Destailleur
fa999dfa65
Merge pull request #7742 from aspangaro/7.0-accountancyproductvariant
...
NEW Accountancy Add variant on sell account for intracommunity sales & export sales
2017-11-06 09:25:14 +01:00
Laurent Destailleur
141bef0b8a
Fix translation and css
2017-11-04 15:21:35 +01:00
Maxime Kohlhaas
e992e4bea5
Fix : type was forced to 0 so service are not in the list
2017-11-03 09:09:07 +01:00
Maxime Kohlhaas
13667e4850
Fix display of product/service list
2017-11-03 08:56:23 +01:00
Alexandre SPANGARO
2d17e4094c
Merge remote-tracking branch 'uptream/develop' into 7.0-accountancyproductvariant
...
# Conflicts:
# htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-11-03 06:18:27 +01:00
Laurent Destailleur
1b28c45e2c
PERF Links in getNomUrl use only one tag a instead of 2.
2017-11-02 15:19:14 +01:00
Alexandre SPANGARO
8d3beef161
Add fields in product card
2017-11-01 07:19:36 +01:00
fappels
3f5112ff48
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into 7.0_new_shipment_update
2017-10-31 16:49:54 +01:00
fappels
f7df9e1d1f
Fix travis
2017-10-31 16:49:39 +01:00
fappels
a9ceb46f97
Add parameter to load all lot from lines of object in cache
...
If you want use the lot stock selector in mutiple lines you can add
lines array. If you don't give a product id or a lines array, no lot
numbers will be loaded.
2017-10-29 20:40:56 +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
8058712d47
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/contrat/class/contrat.class.php
htdocs/product/list.php
2017-10-26 17:06:11 +02:00
Laurent Destailleur
67208b111d
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/compta/facture.php
htdocs/expedition/card.php
htdocs/product/list.php
2017-10-26 17:02:40 +02:00
Laurent Destailleur
6163a3d54d
Code comment
2017-10-26 16:57:17 +02:00
Laurent Destailleur
0efd118d43
Fix hook on product list
2017-10-26 16:50:38 +02:00
Laurent Destailleur
202712be94
Work on module builder
2017-10-25 22:02:07 +02:00
Laurent Destailleur
f24204c79a
Error management after extrafield update
2017-10-24 19:04:40 +02:00
Laurent Destailleur
9f0f5eb5e8
Fix translation of extrafields type
2017-10-24 18:05:43 +02:00
Laurent Destailleur
d2f723045c
Work on website and modulebuilder
2017-10-24 17:30:05 +02:00
fappels
7f7e621ea9
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into 7.0_new_shipment_update
2017-10-24 10:53:34 +02:00
fappels
fe2acb2cb6
Add form select for lot numbers
2017-10-23 22:17:24 +02:00
Laurent Destailleur
285203ed0e
Reduce diplicate code
2017-10-22 17:00:35 +02:00
Laurent Destailleur
36ad17cc95
Work on module builder
2017-10-22 16:45:18 +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
4a1834ee29
#7411
2017-10-22 04:23:17 +02:00
Laurent Destailleur
c9fceaad3c
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/index.php
htdocs/fourn/facture/card.php
2017-10-22 04:04:26 +02:00
Laurent Destailleur
030cea6a0f
Merge pull request #7664 from frederic34/patch-1
...
keep vat input with multiprices product creation
2017-10-22 02:42:44 +02:00
Laurent Destailleur
19a5780f7f
Clean code
2017-10-20 23:49:20 +02:00
Laurent Destailleur
abd5251330
Better responsive
2017-10-19 19:53:29 +02:00
Frédéric FRANCE
5afd2695fb
keep vat input with multiprices product creation
2017-10-19 18:33:15 +02:00
florian HENRY
b0c68ddc61
fix displaying accountancy code
2017-10-19 12:35:59 +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
Laurent Destailleur
347883b7be
Code comment
2017-10-18 10:39:36 +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
33624e1001
NEW Attaching doc automatically in email is now a parameter of template.
2017-10-08 16:34:42 +02:00
Laurent Destailleur
df2f73bdc3
Fix quick search on product/services
2017-10-07 20:36:32 +02:00
Laurent Destailleur
e40bffb0d5
Fix bug reported by scrutinizer
2017-10-07 20:21: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
Regis Houssin
45de1ca21e
Fix: check security
2017-10-03 19:09:46 +02:00
Regis Houssin
4537e5472b
Fix: refactorization of "getListForItem" function
2017-10-03 19:01:54 +02:00
Regis Houssin
ed5dca652d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_bug_restapi
2017-10-03 17:32:40 +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
Regis Houssin
f8f4ff6d21
Fix: missing include api_categories class
2017-10-03 13:07:07 +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
8866683a72
Merge branch '6.0' of github.com:Dolibarr/dolibarr into FIX_replenish_stock_line_0
2017-09-27 10:55:49 +02:00
arnaud
7f807986d7
FIX replenish if line test GETPOST on line 0
2017-09-27 10:53:29 +02:00
Laurent Destailleur
f1a563625b
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
2017-09-26 22:11:00 +02:00
Laurent Destailleur
d7dd6ed334
Fix undefined var
2017-09-26 16:15:22 +02:00
Laurent Destailleur
1002923dea
Fix css
2017-09-26 10:58:24 +02:00
Laurent Destailleur
7f420f3246
Complete vat rates for india
2017-09-26 10:54:07 +02:00
Laurent Destailleur
4f76545b62
Add missing fields to manage localtax on supplier products
2017-09-26 10:47:08 +02:00
Laurent Destailleur
5482f80c0e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-26 10:30:47 +02:00
Laurent Destailleur
59571b1ce1
FIX #7473 Mass update of vat rates and other bugs on localtax
2017-09-26 10:29:44 +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
Regis Houssin
16941f1d9d
Fix: uniformize code
2017-09-25 16:46:13 +02:00
Laurent Destailleur
e3da4188e2
GETPOST must not clean data for text input.
2017-09-25 00:16:52 +02:00
Laurent Destailleur
934edd9f5a
Merge branch 'develop' into 6.0-api
2017-09-24 22:01:07 +02:00
Laurent Destailleur
91d303465d
NEW Can add html content on right of tabs
2017-09-24 01:39:06 +02:00
Laurent Destailleur
fc5c9ad2f2
Merge pull request #7436 from fappels/6.0_Fix_expedition_error_handling
...
Fix batch required for lot product error message.
2017-09-20 17:33:05 +02:00
Regis Houssin
77fea1983c
Fix: wrong supplier product price id
2017-09-20 16:57:38 +02:00
Laurent Destailleur
1e33495f42
Fix remove warnings
2017-09-19 00:31:51 +02:00
Regis Houssin
cdd1473cfa
Fix: avoid Warning: A non-numeric value encountered
2017-09-18 16:30:01 +02:00
Laurent Destailleur
291a0d46e6
Fix edit of categories
2017-09-18 01:39:39 +02:00
Laurent Destailleur
dece156a99
NEW Add supplier proposals into stats of product page.
2017-09-17 18:08:43 +02:00
Laurent Destailleur
a3c555049d
NEW Add supplier proposals into stats of product page.
2017-09-17 18:08:23 +02:00
Laurent Destailleur
ad40d27324
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_sendmails.inc.php
2017-09-16 12:22:18 +02:00
Laurent Destailleur
8773a6860f
Fix HTML5 use of <br> is preferred to <br />
2017-09-15 23:49:04 +02:00
Laurent Destailleur
48ae76e295
Fix picto on service
2017-09-15 19:13:40 +02:00
Laurent Destailleur
55e31796d2
Code comment
2017-09-15 19:08:39 +02:00
Josep Lluís
c43515f484
Fix: Custom info view in services
...
In services view, custom info should be hide.
Also, Nature field is moved and grouped with product fields
2017-09-15 17:11:03 +02:00
Laurent Destailleur
5e34b121dd
Add more robust php unit to detect not escaped sql. Fix not escaped sql
2017-09-15 15:41:07 +02:00
Laurent Destailleur
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
Laurent Destailleur
eadfbfe2bd
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/core/lib/functions2.lib.php
2017-09-13 20:57:53 +02:00
Laurent Destailleur
149ab80b3a
The event array of an object is visible even if no event yet recorded.
2017-09-13 14:18:36 +02:00
Laurent Destailleur
724817139d
Start remove $GLOBALS
2017-09-12 19:49:07 +02:00
Laurent Destailleur
939d33cce7
Fix bug reported by scrutinizer
2017-09-12 19:12:39 +02:00
Laurent Destailleur
47d2350ad4
Fix bugs reported by scrutinizer
2017-09-12 19:03:12 +02:00
Laurent Destailleur
d572e1ddad
Fix duration output
2017-09-12 17:30:18 +02:00
fappels
681c2a67bd
Fix batch required for lot product error message.
2017-09-11 23:22:44 +02:00
Laurent Destailleur
cb0c7d6594
Standardize search field name
2017-09-11 00:10:23 +02:00
Laurent Destailleur
cb7456239b
Remove deprecated file
2017-09-11 00:03:05 +02:00
Laurent Destailleur
cf56da8102
NEW Default filter and sort order can use partial list of query
...
parameters to set the qualified URLs.
2017-09-11 00:02:52 +02:00
Laurent Destailleur
4f52871c67
Merge pull request #7345 from AXeL-dev/develop
...
fix hidepriceinlabel when using ajax autocompleter
2017-09-08 21:22:38 +02:00
Laurent Destailleur
259cca0230
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/admin/mails_templates.php
2017-09-08 13:30:54 +02:00
Laurent Destailleur
03fe9d4e97
Escape all status
2017-09-08 13:23:12 +02:00
AXeL-dev
a615a46a5a
fix hidepricelabel when using ajax autocompleter
2017-09-08 11:06:55 +01:00
Laurent Destailleur
bde293af22
Fix filter on extrafield with type sellist
2017-09-07 15:34:25 +02:00
Laurent Destailleur
c573df4f0e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/user/card.php
2017-08-26 22:33:56 +02:00
fappels
533881e620
Fix supplier prices not shown when best buy hidden
...
only show value if item has supplier
2017-08-25 11:58:34 +02:00
Laurent Destailleur
4337001418
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/societe/list.php
2017-08-24 14:26:45 +02:00
Laurent Destailleur
bf1f60b31e
Merge
2017-08-23 17:14:29 +02:00
Laurent Destailleur
90afbcb034
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/bank.php
htdocs/core/lib/functions.lib.php
2017-08-23 17:02:53 +02:00
Laurent Destailleur
6b5b10fc94
FIX #7224
2017-08-23 16:28:34 +02:00
Laurent Destailleur
f3ef6448d7
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/admin/supplier_payment.php
htdocs/core/lib/ajax.lib.php
htdocs/don/admin/donation.php
htdocs/product/admin/product.php
2017-08-23 16:11:51 +02:00
Regis Houssin
2492b9968a
Fix: missing scandir
2017-08-23 10:21:10 +02:00
Regis Houssin
6dda2f3670
Fix: "scandir" in url is blocked in some providers
2017-08-23 10:07:00 +02:00
Laurent Destailleur
681623c3ab
Merge branch 'develop' into patch-1
2017-08-22 11:43:25 +02:00
Laurent Destailleur
7d57cd6913
Update productcustomerprice.class.php
2017-08-22 11:38:32 +02:00
Laurent Destailleur
097b660c41
Mutualize code
2017-08-18 16:25:00 +02:00
Laurent Destailleur
e9eefb170f
Merge pull request #7212 from ATM-Marc/NEW_price_formObjectOptions_hook
...
NEW hook formObjectOptions in the form setting product selling price
2017-08-17 18:25:30 +02:00
Laurent Destailleur
40b3c7c4d5
Merge pull request #7253 from altatof/fix_restrictedarea_parms
...
FIX : same logic for setting fieldvalue and fieldtype
2017-08-17 17:22:36 +02:00
altatof
650e4eaa50
FIX : same logic for setting fieldvalue and fieldtype
2017-08-10 16:41:09 +02:00
Laurent Destailleur
402e6bf650
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/various_payment/card.php
htdocs/compta/bank/various_payment/index.php
htdocs/compta/paiement/list.php
htdocs/core/modules/modCron.class.php
2017-08-04 15:39:00 +02:00
Laurent Destailleur
7c840b8348
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2017-08-04 15:32:30 +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
florian HENRY
53add04a2e
fix :add missing hook into product price card
2017-07-31 10:28:24 +02:00
Marc de Lima Lucio
2cb89b2d8b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_price_formObjectOptions_hook
2017-07-27 17:16:58 +02:00
Marc de Lima Lucio
677d50df5b
NEW: add 'formObjectOptions' hook to the form setting the product selling price
2017-07-27 17:11:15 +02:00
Laurent Destailleur
5bf10737d9
Merge branch 'develop' into patch-14
2017-07-25 18:32:36 +02:00
Laurent Destailleur
4ef36746bd
Merge pull request #7199 from hguibourgdev/patch-13
...
NEW : Add toolkit for StockLimit and DesiredStock
2017-07-25 18:31:12 +02:00
Laurent Destailleur
f6ab691c08
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-25 01:22:29 +02:00
Laurent Destailleur
aff61fad7d
Fix new generic classes system
2017-07-25 01:21:20 +02:00
hguibourgdev
6b9d25708b
NEW : Add toolkit for StockLimit
2017-07-24 21:05:21 +02:00
hguibourgdev
e1f8cfd474
NEW : Add toolkit for StockLimit and DesiredStock
2017-07-24 20:59:46 +02:00
Laurent Destailleur
929d14c816
Merge pull request #7078 from atm-florian/dev_prodlist
...
NEW : filter on extrafield on product list (as in company list)
2017-07-21 15:15:11 +02:00
hguibourgdev
4b0638dd40
Update list.php
...
FIX copy-paste error (sell versus buy)
2017-07-18 14:43:03 +02:00
hguibourgdev
4633d1ae7e
Update list.php
...
FIX copy-paste error (sell versus buy)
2017-07-15 19:04:10 +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
florian HENRY
8e3c2af7ee
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_prodlist
Conflicts:
htdocs/accountancy/class/accountancycategory.class.php
2017-07-10 16:16:11 +02:00
fappels
13d6664ab4
Fix delete product from product card
2017-07-09 12:47:51 +02:00
Laurent Destailleur
f40afcf023
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/accountancy/class/bookkeeping.class.php
htdocs/compta/facture/list.php
htdocs/compta/paiement/class/cpaiement.class.php
htdocs/compta/sociales/card.php
htdocs/core/lib/functions.lib.php
htdocs/expensereport/card.php
htdocs/expensereport/class/expensereport.class.php
htdocs/product/stats/facture.php
2017-07-08 18:32:34 +02:00
Laurent Destailleur
a9468ad84a
Look and feel v6
2017-07-08 00:42:55 +02:00
Laurent Destailleur
608e9e1c82
Look and feel v6 (no amount symbol into list)
2017-07-07 19:48:35 +02:00
Laurent Destailleur
de24e93cca
Merge pull request #7097 from fappels/develop_nbr_suppliers_prod_list
...
NEW: Add column with nbr suppliers prices and WAP to product list.
2017-07-07 19:42:25 +02:00
Laurent Destailleur
b7af0cca63
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/holiday/card.php
2017-07-07 19:39:57 +02:00
Laurent Destailleur
aa4ff464d6
Merge pull request #7096 from fappels/6.0_fix_virtual_stock_read_rights_third_parties
...
FIX: Ignore third party read rights filter for virtual stock calculation.
2017-07-07 19:34:12 +02:00
Laurent Destailleur
4c0fcb2b9a
Fix total with tax does not include local taxes. To solve, i show both
...
totals.
2017-07-07 14:58:57 +02:00
Laurent Destailleur
8abec461a6
Fix total with tax does not include local taxes. To solve, i show both
...
totals.
2017-07-07 12:31:00 +02:00
fappels
857e45baf3
Fix comment
2017-07-06 15:34:10 +02:00
Laurent Destailleur
95cf36c43b
Fix use the getUrl function instead of hard coded curl
2017-07-04 10:55:53 +02:00
fappels
78283b6a0b
Ignore rights filter for virtual stock calculation.
2017-06-30 17:02:50 +02:00
fappels
989084e4de
WAP always 2 decimals
2017-06-30 10:56:05 +02:00
arnaud
ca6ce2ba8b
FIX status were wrong on product referent list
2017-06-30 10:38:54 +02:00
florian HENRY
53510ac660
NEW : filter on extrafield on product list (as in company list)
2017-06-29 10:14:48 +02:00
Laurent Destailleur
adf281c4f3
Look and feel v6
2017-06-27 17:42:07 +02:00
Laurent Destailleur
6f82837b0f
Fix GETPOST of lang_id
2017-06-27 17:27:01 +02:00
Laurent Destailleur
c213624c14
Fix migration into product_lot
2017-06-27 16:42:37 +02:00
Laurent Destailleur
77ba5a8c24
Fix reception of product interface
2017-06-27 14:02:01 +02:00
fappels
e3f7402e07
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_nbr_suppliers_prod_list
2017-06-26 22:45:18 +02:00
fappels
13e5c8ff7a
Create patch
...
Add Number of supplier prices and wap columns
2017-06-26 22:44:56 +02:00
Laurent Destailleur
59bd4749a8
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
htdocs/core/menus/standard/eldy.lib.php
htdocs/product/class/product.class.php
2017-06-24 10:27:10 +02:00
Laurent Destailleur
1211e0d7ab
FIX vat code not saved during product creation.
2017-06-23 12:09:21 +02:00
Laurent Destailleur
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
86a6a83647
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/admin/tools/index.php
htdocs/bookmarks/bookmarks.lib.php
htdocs/compta/facture.php
htdocs/core/tpl/passwordforgotten.tpl.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/main.inc.php
htdocs/product/stats/card.php
htdocs/public/paypal/paymentko.php
2017-06-18 21:13:48 +02:00
Laurent Destailleur
abe736c6a6
Escape hml tags
2017-06-18 19:42:59 +02:00
BENKE Charlene
e98bc90489
introduce OZ : once weight
2017-06-17 10:18:59 +02:00
Laurent Destailleur
b889db997a
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/datepicker.php
htdocs/core/get_menudiv.php
htdocs/core/menus/standard/auguria.lib.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/search_page.php
htdocs/main.inc.php
htdocs/master.inc.php
htdocs/product/list.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
htdocs/user/card.php
htdocs/user/index.php
2017-06-14 10:48:34 +02:00
Laurent Destailleur
e4c7f584e3
Fix option STOCK_SUPPORTS_SERVICES (stock not visible when it should)
2017-06-13 11:45:21 +02:00
Laurent Destailleur
5def2d2600
Add div to help debug of html content
2017-06-13 11:14:52 +02:00
phf
b67a14c7d6
Fix ajax search product is broken
2017-06-13 10:20:26 +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
cd08690646
Fix ajax search product that return bad json response
2017-06-12 12:42:06 +02:00
Laurent Destailleur
8f7371cdf0
Product has 2 status. Add span to differentiate for css
2017-06-12 12:24:42 +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
1af74b4c42
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/skeletons/skeleton_list.php
htdocs/admin/perms.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/hookmanager.class.php
htdocs/core/lib/files.lib.php
htdocs/product/class/product.class.php
htdocs/product/class/service.class.php
htdocs/product/index.php
htdocs/product/list.php
htdocs/public/members/new.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2017-06-09 12:50:56 +02:00
Laurent Destailleur
1935de03c7
Fix bad consistency of labels
2017-06-09 12:01:55 +02:00
Laurent Destailleur
02781b41ca
Fix several problem with hook printFieldListWhere
2017-06-09 11:02:34 +02:00
Laurent Destailleur
b92980c6ff
Fix statistics on products
2017-06-09 10:38:06 +02:00
Laurent Destailleur
bec6ad9fb3
Fix bad position of hook
2017-06-09 10:22:07 +02:00
Laurent Destailleur
d6ba16d357
Fix missing printFieldListWhere hook
2017-06-09 09:45:22 +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
543630e487
Fix missing count of nb of columns into lists
2017-06-08 14:14:06 +02:00
Laurent Destailleur
7587a3d592
Merge branch 'develop' into develop_transverse
2017-06-08 10:25:04 +02:00
Laurent Destailleur
cfe9d02bc3
Merge pull request #6952 from atm-ph/fix_search_extrafield_on_list
...
Fix can't use search on all extrafields on list
2017-06-08 10:18:55 +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
phf
707a9e40c0
Fix can't use search on all extrafields on list
2017-06-06 12:01:49 +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
77df19009d
Removed duplicated code
2017-06-01 12:11:45 +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
425192ef84
Merge branch 'develop' into 6.0-multijournal
2017-05-29 10:23:46 +02:00
Alexandre SPANGARO
e89c4e9f41
Merge remote-tracking branch 'uptream/develop' into 6.0-pcard
2017-05-25 07:15:03 +02:00
Alexandre SPANGARO
1f079fac9d
Move html.formventilation.class.php to html.formaccounting.class.php
2017-05-25 06:57:28 +02:00
Laurent Destailleur
1a8884bbbe
NEW Can filter on year and product tags on the product statistic page
2017-05-22 15:20:52 +02:00
Laurent Destailleur
f5e29d6c86
Fix phpcs warning
2017-05-22 10:45:02 +02:00
Alexandre SPANGARO
d834cbf7ba
Use getNomUrl for accounting account in product card
2017-05-21 15:24:16 +02:00
Laurent Destailleur
b3dc73e611
Look and feel v6
2017-05-21 02:43:51 +02:00
Laurent Destailleur
e4ec5aa9a9
Merge pull request #6818 from atm-alexis/NEW_poc_list_product_with_listview
...
NEW poc list product with listview
2017-05-19 18:21:49 +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
c224e2b4f6
Remove table that does not exists
2017-05-17 16:05:26 +02:00
Laurent Destailleur
1d6b4cb28a
Look and feel v6
2017-05-17 15:25:09 +02:00
Laurent Destailleur
a8afa547f0
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture.php
2017-05-17 15:20:17 +02:00
Laurent Destailleur
e2a7b0943f
Clean dead code
2017-05-17 14:52:27 +02:00
Laurent Destailleur
d86b42b024
Missing title, bad css
2017-05-17 14:45:08 +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
Alexandre SPANGARO
93554b7e30
Typo searchpicto
2017-05-14 21:06:33 +02:00
Laurent Destailleur
fa290c34fa
Fix against SQL injection. Add phpunit to detect missing escapement.
2017-05-12 16:55:11 +02:00
Laurent Destailleur
0d11fce834
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-05-12 15:45:30 +02:00
Laurent Destailleur
5581e5da72
FIX New vat code not correctly implemented if "1 price per customer".
2017-05-12 13:12:17 +02:00
Laurent Destailleur
30cf3f2bda
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/install/mysql/tables/llx_bank_account.sql
2017-05-11 00:03:06 +02:00
Laurent Destailleur
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
alexis portable
8272408b6e
fix travis case statement
2017-05-09 14:43:54 +02:00
alexis portable
651ea92657
NEW fix listview class and add a demo for product list
2017-05-09 14:26:47 +02:00
Laurent Destailleur
46ff62fc87
Work on inventory module debug
2017-05-06 22:28:07 +02:00
Laurent Destailleur
d948447600
Add button to disable all personalized default values in one click.
2017-05-06 17:08:38 +02:00
Laurent Destailleur
11b1a2adac
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/expensereportsjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/bank/index.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/includes/odtphp/Segment.php
htdocs/langs/en_US/admin.lang
htdocs/societe/soc.php
2017-05-05 14:49:25 +02:00
Laurent Destailleur
768df56c07
Uniformize name of standard PDF template
2017-05-04 20:16:55 +02:00
Laurent Destailleur
c196e79bf4
Merge branch 'develop' into FIX_inventory
2017-05-04 13:50:53 +02:00
Laurent Destailleur
1a6c118a5d
Fix travis warning
2017-05-04 12:41:29 +02:00
Laurent Destailleur
8009370f04
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/contact/document.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/install/mysql/migration/repair.sql
2017-05-04 10:01:11 +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
1e3384a842
Fix travis
2017-04-30 14:16:58 +02:00
Laurent Destailleur
072eb740c7
Fix php compatibility
2017-04-30 13:57:13 +02:00
Laurent Destailleur
865c8140d1
Clean code
2017-04-30 03:23:06 +02:00
Laurent Destailleur
b57bf6460b
Start debug inventory
2017-04-30 02:34:00 +02:00
Laurent Destailleur
4993a43025
Move new feature inventory into module stock.
2017-04-30 02:25:05 +02:00
Laurent Destailleur
92b5f8d85e
Move new feature inventory into module stock.
2017-04-29 21:53:01 +02:00
Laurent Destailleur
50d65e3a9f
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/install/mysql/migration/repair.sql
2017-04-29 17:40:47 +02:00
Laurent Destailleur
cd099bf3b1
Fix bad update of prices
2017-04-24 12:42:54 +02:00
Laurent Destailleur
4c056d68d8
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/commande/list.php
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/bills.lang
htdocs/societe/list.php
2017-04-15 17:02:05 +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
3e9ccc186a
NEW Small PDF template for products
2017-04-13 10:26:12 +02:00
Laurent Destailleur
a6b05bb4da
Merge branch '5.0' of github.com:Dolibarr/dolibarr into 5.0
2017-04-12 14:08:58 +02:00
Laurent Destailleur
26a9999fbf
Support of preview for pdf with several pages
2017-04-12 11:38:55 +02:00
Laurent Destailleur
b054ca8267
NEW Introduce mass action on product list ('delete' for the moment)
2017-04-09 15:02:55 +02:00
Laurent Destailleur
be439f6252
Work on look and feel v6
2017-04-07 16:16:44 +02:00
Laurent Destailleur
ea44e14b60
Start debug the variant module
2017-04-07 11:01:12 +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
54b03a3552
Work on 6.0 new look and feel
2017-03-29 11:03:13 +02:00
Laurent Destailleur
219bcb0d54
Work on 6.0 features.
2017-03-27 22:44:50 +02:00
BENKE Charlie
d8018f7937
add trigger on product price add/update
2017-03-26 19:16:19 +02:00
BENKE Charlie
ec3402a04b
Update note.php
2017-03-25 10:52:03 +01:00
BENKE Charlie
656875acb5
Update info.php
2017-03-25 10:49:57 +01:00
BENKE Charlie
a1db02cc08
Update fournisseurs.php
2017-03-25 10:48:50 +01:00
BENKE Charlie
cf68039c36
Update document.php
2017-03-25 10:47:42 +01:00
BENKE Charlie
2e6ab393df
add next_prev_filter for pagination
2017-03-25 10:45:01 +01:00
Laurent Destailleur
2f4a4f493e
Missin translation
2017-03-25 01:47:52 +01:00
Laurent Destailleur
3adb43c6e5
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/boxes/box_produits.php
htdocs/core/boxes/box_produits_alerte_stock.php
htdocs/langs/en_US/bills.lang
htdocs/product/class/product.class.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2017-03-23 12:52:19 +01:00
Laurent Destailleur
ee8112dde7
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/projet/class/project.class.php
2017-03-21 19:20:14 +01:00
Laurent Destailleur
43e70830ed
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-03-21 17:18:41 +01:00
Laurent Destailleur
b9a9997688
Page societe/soc.php and compta/facture.php was renamed into card.php
...
to match page naming conventions.
2017-03-20 21:29:22 +01:00
Laurent Destailleur
4831fb4dcb
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/filefunc.inc.php
2017-03-19 11:26:49 +01:00
Laurent Destailleur
dfc1ed7d72
FIX #6535
2017-03-16 22:49:02 +01:00
Laurent Destailleur
9827887643
Merge pull request #6519 from marcosgdf/bug-multiprices
...
FIX Corrected bug where product multiprices admin page would not render properly due to a PHP fatal error
2017-03-14 10:45:47 +01:00
Laurent Destailleur
d951114c18
Merge branch 'develop' into NEW_odt_others_objects
2017-03-14 10:44:05 +01:00
arnaud
192a825de8
NEW ODT docs for USER USERGROUP CONTRACT and PRODUCT class
2017-03-14 09:25:29 +01:00
Marcos García de La Fuente
15d0e6abc5
Corrected bug where product multiprices admin page would not render properly due to a PHP fatal error
2017-03-13 20:33:21 +01:00
Laurent Destailleur
7103d7921e
Uniformize look
2017-03-11 13:42:16 +01: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
arnaud
a796a321cc
Merge branch '3.9_dalibo' of github.com:ATM-Consulting/dolibarr into NEW_odt_others_objects
...
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/product/admin/product.php
htdocs/product/card.php
2017-03-10 12:16:55 +01:00
Laurent Destailleur
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
Laurent Destailleur
4e4045d18a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-05 22:12:08 +01:00
Laurent Destailleur
5f79b2d0c6
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/accountancy/admin/categories.php
htdocs/expensereport/class/expensereport.class.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2017-03-05 22:11:35 +01:00
Laurent Destailleur
f67c967d0b
FIX The vat rate line used when adding a predefined product was wrong if
...
there is several vat line with same rate.
2017-03-04 22:27:44 +01:00
Laurent Destailleur
832c91417a
Fix the default_vat_code was not correctly saved and shown on the
...
product price.
2017-03-04 19:16:09 +01:00
Laurent Destailleur
a5019e1619
Fix position of field
2017-03-04 18:17:04 +01:00
Laurent Destailleur
bbd32b9294
Fix bad count
2017-03-04 14:34:43 +01:00
fmarcet
e1f459d67a
Fix: Error when references are numeric
2017-03-03 12:57:52 +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
58229907d4
Removed not used class "Service". Reduce nb of request on dashboard.
2017-02-28 12:35:55 +01:00
Laurent Destailleur
170ad1a265
Depreciate a class not really used
2017-02-27 00:56:44 +01:00
Laurent Destailleur
fb88eaf2a4
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-02-23 02:55:50 +01:00
Laurent Destailleur
fc6fb61476
Minor fix in typo
2017-02-22 02:19:05 +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
d72e5a3646
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-10 17:34:23 +01:00
Laurent Destailleur
ad308e33cc
Fix scrutinizer warning
2017-02-09 18:29:04 +01:00
Laurent Destailleur
e0850b29cd
Merge pull request #6399 from fappels/5.0
...
Qual reputation for price supplier
2017-02-08 16:42:20 +01:00
fappels
b1fe8e3f2b
fix merge
2017-02-08 13:45:42 +01:00
fappels
a84c6f9b45
Qual reputation for price supplier
...
Move available reputation constants from view-controller to class
2017-02-08 13:35:34 +01:00
Laurent Destailleur
e1a6e6e4ab
Rename "attributes" into "variants" to avoid confusion with extrafields
2017-02-08 12:37:38 +01:00
Laurent Destailleur
b24f244f67
Merge pull request #5533 from marcosgdf/prod-attr
...
Feature Request: NEW Added product attributes feature
2017-02-08 11:20:33 +01:00
Laurent Destailleur
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
aa1c14e508
Remove change of PMP when we should not
2017-02-06 20:43:44 +01:00
Marcos García de La Fuente
d06fb423c0
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/langs/en_US/products.lang
2017-02-02 20:07:41 +01:00
Laurent Destailleur
64da0e77d5
Merge pull request #6358 from defrance/patch-71
...
FIX : fill fourn remise percent with select product mode
2017-02-02 02:27:35 +01:00
Laurent Destailleur
13f37b2cb9
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-02 02:25:49 +01:00
Laurent Destailleur
6b1e81fa1d
Fix missing space
2017-02-02 02:22:01 +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
Laurent Destailleur
9a9b31c9c0
Fix cancel button + logic to close project when setting opp to WON/LOST.
2017-02-01 13:25:16 +01:00
BENKE Charlie
772d862766
Update product.class.php
2017-01-31 23:13:58 +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
BENKE Charlie
e73a132ed9
PHP7 warning error on $page not affected
2017-01-25 16:24:12 +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
Gustavo Novaro
22a815a1b4
Merge remote-tracking branch 'upstream/develop' into develop
2017-01-17 01:21:44 -03:00
Laurent Destailleur
fafe71ec52
Fix autocalculation of surface and volume.
2017-01-16 10:55:33 +01:00
Laurent Destailleur
1b1bab94ca
More complete commit for #6114
2017-01-16 10:43:22 +01:00
Laurent Destailleur
81d76f8600
Merge pull request #6114 from defrance/patch-52
...
NEW Allow to change heigth and width on product
2017-01-16 10:19:47 +01:00
Laurent Destailleur
846e827e09
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-16 00:49:11 +01:00
Laurent Destailleur
f5458b4337
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/admin/modules.php
htdocs/core/class/html.formfile.class.php
htdocs/product/stats/card.php
2017-01-16 00:48:37 +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
Regis Houssin
c3997194b2
Fix: avoid foreach error
2017-01-15 15:17:32 +01:00
Marcos García de La Fuente
d09a3628c5
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/compta/facture.php
2017-01-14 23:59:14 +01:00
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
Gustavo Novaro
751aa2a2aa
Improve code style
2017-01-12 12:11:45 -03: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
arnaud
b813144edb
NEW generation ODT
2017-01-06 16:44:09 +01:00
Laurent Destailleur
febd23fe41
Clean dead code
2017-01-03 11:22:03 +01:00
Laurent Destailleur
1f2f03c287
Merge pull request #6222 from gnovaro/patch-4
...
var to public
2016-12-31 17:27:07 +01:00
Laurent Destailleur
2c4e8926f8
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop6
2016-12-31 17:24:14 +01:00
Laurent Destailleur
f46ce68d08
NEW Can sort thumbs visible on product card
2016-12-31 16:16:20 +01:00
Marcos García de La Fuente
154425e2bc
Fixed PHP fatal error
2016-12-27 16:13:39 +01:00
Laurent Destailleur
b5c815367c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6
2016-12-26 15:44:31 +01:00
Marcos García de La Fuente
5669f734b8
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/comm/propal/card.php
# htdocs/commande/card.php
# htdocs/compta/facture.php
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-12-24 21:39:40 +01:00
Gustavo Novaro
191f69ec79
var to public
...
Improve code style
2016-12-23 14:06:11 -03:00
