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
