lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
56,393 Commits 43 Branches 150 Tags 886 MiB
6da82762f2
Commit Graph

3361 Commits

Author SHA1 Message Date
Laurent Destailleur
d39d7d92c9 Uniformize code. 2016-09-26 02:13:58 +02:00
Laurent Destailleur
ea09eb13da Uniformize code 2016-09-26 00:10:29 +02:00
Laurent Destailleur
8fa8bc7d34 Rename table for a better understanding 2016-09-22 11:39:43 +02:00
Laurent Destailleur
cef02a9766 Merge pull request #5764 from atm-gauthier/NEW_add_limit_stock_product_by_warehouse 
New add limit stock product by warehouse
 2016-09-22 09:15:05 +02:00
Laurent Destailleur
d4e324d15a Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/facture.php
 2016-09-21 18:38:30 +02:00
Laurent Destailleur
9c12444a03 Fix size of warehouse and height of confirm box 2016-09-21 18:20:18 +02:00
gauthier
2556e59ccf NEW : auto delete product_stock_entrepot elements when we drop a product or a warehouse 2016-09-21 16:21:23 +02:00
gauthier
b95b84a665 FIX : doc comment for parameter $fk_product 2016-09-20 15:31:55 +02:00
gauthier
dc15eb079a FIX : keep params when we search or skip to another page 2016-09-20 14:38:05 +02:00
gauthier
d508d44fef NEW : migration script from 4.0.0 to 5.0.0 and langs 2016-09-20 12:10:25 +02:00
gauthier
a0ec91cb94 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_add_limit_stock_product_by_warehouse 2016-09-20 12:03:55 +02:00
gauthier
a698e40c45 NEW : filter fk_warehouse on replenishment card 2016-09-20 11:55:38 +02:00
gauthier
43e77d23e9 NEW : Delete product stock warehouse 2016-09-19 17:40:59 +02:00
gauthier
a4d0eed503 NEW : Save product stock warehouse in database and display list 2016-09-19 17:33:29 +02:00
Laurent Destailleur
4f842fd2cb Uniformize look and feel 2016-09-19 13:57:50 +02:00
Laurent Destailleur
c8b8e13014 Work on dol_banner for proposals. 2016-09-18 21:38:20 +02:00
Laurent Destailleur
d1c4f02bf7 Uniformize code and style 2016-09-18 14:41:17 +02:00
Laurent Destailleur
407d9e6904 Merge pull request #5741 from atm-quentin/new_hook_stock_product_develop_dolibarr 
NEW Hook on stock product card
 2016-09-17 18:04:39 +02:00
gauthier
7a0577ccfc NEW : add limit stock product by warehouse 2016-09-16 17:09:38 +02:00
Quentin Vial-Gouteyron
6d304f4a23 NEW Hook formObjectOptions 2016-09-13 14:56:57 +02:00
Quentin Vial-Gouteyron
f8912267cb NEW Hook on stock product card 2016-09-13 11:56:39 +02:00
Laurent Destailleur
0ab377440d Complete param of setValueFrom 2016-09-12 20:16:39 +02:00
Laurent Destailleur
5c1127fc54 NEW Enhance function setValueFrom so we can use it for "edit in form" 
feature.
 2016-09-12 20:00:47 +02:00
Laurent Destailleur
1f9aa856d5 NEW the list of linked files on card does not forget external links. 2016-09-12 18:37:40 +02:00
Laurent Destailleur
2587958c89 Introduce hidden constant PRODUCT_ADD_FORM_ADD_TO for an old feature not 
used so we can disable/enabled if we want.
 2016-09-12 18:15:01 +02:00
Laurent Destailleur
5ea9fc7467 NEW Support extrafields on product lot. 2016-09-12 17:27:44 +02:00
Laurent Destailleur
359ebed882 FIX #5696 2016-09-12 02:57:28 +02:00
Laurent Destailleur
9ff1809f85 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/card.php
	htdocs/product/stock/class/productlot.class.php
	htdocs/theme/eldy/style.css.php
 2016-09-12 02:05:38 +02:00
Laurent Destailleur
1fbf233f95 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/contact/list.php
	htdocs/contrat/list.php
	htdocs/expedition/list.php
	htdocs/expensereport/list.php
	htdocs/fichinter/list.php
	htdocs/fourn/commande/list.php
	htdocs/product/reassort.php
	htdocs/product/reassortlot.php
	htdocs/product/stock/list.php
	htdocs/societe/list.php
	htdocs/supplier_proposal/list.php
	htdocs/theme/eldy/style.css.php
 2016-09-12 01:50:38 +02:00
Laurent Destailleur
4ea5068966 FIX Clean of search fields 2016-09-12 00:15:27 +02:00
Laurent Destailleur
1bb278a587 Fix #5712 2016-09-11 23:01:04 +02:00
Laurent Destailleur
25c5f40bf1 Add css on picto status 2016-09-10 19:44:55 +02:00
Ferran Marcet
4777faf49b Fix: Search all is lost on lists when pagination or when the columns are sorted 2016-09-09 14:02:27 +02:00
Ferran Marcet
b5db70342b Fix: Search all is lost on lists when pagination or when the columns are sorted 2016-09-09 13:58:41 +02:00
Laurent Destailleur
72e149e1a6 FIX SEC Improve CSRF protection. Reduce usage of NOCSRFCHECK. 2016-09-08 12:12:00 +02:00
fappels
6574ebcbff Replace non existing ref parameter 
Replace non existing ref parameter with product_id and batch to fetch a
specific batch from a product.
Remove unused sceleton methods.
 2016-09-07 12:40:15 +02:00
Laurent Destailleur
13746a3c03 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-02 22:37:59 +02:00
Laurent Destailleur
acdce83f9c Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/product/price.php
 2016-09-02 22:37:01 +02:00
Laurent Destailleur
b107b0644f Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-02 22:07:17 +02:00
Laurent Destailleur
8c4324d912 FIX #5674 2016-09-02 21:15:48 +02:00
Laurent Destailleur
4fa94e3a25 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-09-02 19:25:04 +02:00
Laurent Destailleur
ba76f12a28 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/product/price.php
	htdocs/product/stock/class/mouvementstock.class.php
 2016-09-02 19:24:28 +02:00
Laurent Destailleur
9c8145eb88 Better fix for 416a0892d7 2016-09-02 19:19:13 +02:00
Laurent Destailleur
570c228ee1 Merge pull request #5692 from fmarcet/3.9 
Fix: An empty variable is used to update multiprice
 2016-09-02 18:24:09 +02:00
fappels
aedd813236 Delete product_lot when product deleted 2016-09-02 18:13:25 +02:00
Ferran Marcet
416a0892d7 Fix: An empty variable is used to update multiprice 2016-09-02 12:32:14 +02:00
fappels
1c626c01ee Ignore time when checking lot dates 2016-09-02 11:29:28 +02:00
aspangaro
a54784588b Fix: Info tab on product card - Double header 2016-09-01 22:39:01 +02:00
aspangaro
50d46fa126 Fix: Product note & double header 2016-09-01 22:36:02 +02:00
Laurent Destailleur
8fd082cf16 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/hrm/hrm.php
 2016-08-31 16:16:19 +02:00
Laurent Destailleur
8cfac3b5c3 FIX Several problems when using smartphone 2016-08-31 12:38:54 +02:00
Laurent Destailleur
524dd79198 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/bank/search.php
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
	htdocs/projet/tasks/time.php
 2016-08-31 00:16:07 +02:00
Laurent Destailleur
d6d474f10d Clean code for category management. 2016-08-29 21:31:27 +02:00
Laurent Destailleur
cd1a12c686 NEW Can edit a label for each price segment when using several segment 
prices for products.
 2016-08-29 16:30:31 +02:00
Laurent Destailleur
8b959a09f2 Fix missing /form 2016-08-29 16:12:56 +02:00
Laurent Destailleur
a9e5668ea4 Fix for jmobile 2016-08-28 16:31:22 +02:00
Laurent Destailleur
989d6e7bc8 Fix responsive design 2016-08-28 16:27:15 +02:00
Laurent Destailleur
92ef3f0cd8 Fix responsive design 2016-08-28 16:17:23 +02:00
Laurent Destailleur
661526f822 Fix for jmobile 2016-08-28 16:00:02 +02:00
Laurent Destailleur
e46bda5f9a Fix for jmobile 2016-08-28 15:58:52 +02:00
Laurent Destailleur
fac28f9589 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/sociales/charges.php
	htdocs/core/boxes/modules_boxes.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
 2016-08-28 02:40:20 +02:00
Laurent Destailleur
88afc4ad5a Merge pull request #5625 from aspangaro/4.0-p42 
Uniformize presentation, add button cancel everywhere
 2016-08-17 16:11:59 +02:00
Laurent Destailleur
58fc64982f Merge pull request #5618 from fappels/4.0_fix_eatby_sellby_check 
Fix sellby without hour check
 2016-08-17 16:10:09 +02:00
aspangaro
b7420372b7 Uniformize presentation, add button cancel everywhere 2016-08-12 22:53:30 +02:00
fappels
f9a9d4d2d8 Fix sellby without hour check 2016-08-11 20:59:56 +02:00
aspangaro
9a0fed93d1 Merge remote-tracking branch 'Upstream/4.0' into 4.0-p37 2016-08-10 07:42:04 +02:00
aspangaro
a1d1396919 Uniformize presentation 2016-08-10 07:40:40 +02:00
Laurent Destailleur
4d4fc87e2b Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/product/stock/productlot_list.php
	htdocs/websites/index.php
 2016-08-09 13:26:08 +02:00
Laurent Destailleur
29fdebe0d9 Fix list of lot 2016-08-09 13:21:30 +02:00
Laurent Destailleur
7b6755cfcd Fix several errors in search an sorting in stock by lot view 2016-08-09 13:14:33 +02:00
Laurent Destailleur
7667dc735e Fix several errors in search an sorting in stock by lot view 2016-08-09 13:11:56 +02:00
Laurent Destailleur
7c7bcac3c4 Fix lost filter 2016-08-08 22:00:01 +02:00
Laurent Destailleur
4b13a11d9c Key must be first field 2016-08-08 20:46:08 +02:00
Laurent Destailleur
57cbda416b Minor fix on stock 2016-08-08 20:41:49 +02:00
Laurent Destailleur
437b796928 Fix search on product ref 2016-08-08 20:34:55 +02:00
Laurent Destailleur
2133b1c3b5 NEW Table with list of lots/serial can be viewed (module product batch). 2016-08-08 20:31:03 +02:00
Laurent Destailleur
bcd055b378 Move button to link to, in same part of code than code to output links. 2016-08-05 15:30:28 +02:00
Laurent Destailleur
e168888c59 NEW Reduce nb of picto on ref into list, merging preview and download 2016-08-05 12:20:11 +02:00
Laurent Destailleur
4cf01bc685 Fix code comment 2016-08-05 04:48:30 +02:00
Laurent Destailleur
e1e8254bcf Fix thumbs are using same extension than original. 2016-08-05 04:31:19 +02:00
Laurent Destailleur
1b10e27618 Fix bad link 2016-08-05 04:20:38 +02:00
Laurent Destailleur
782ab6a02b Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/core/modules/barcode/modules_barcode.class.php
	htdocs/product/admin/product.php
 2016-08-05 00:42:40 +02:00
Laurent Destailleur
c2e81b6edb Fix colspan 2016-08-05 00:36:58 +02:00
Laurent Destailleur
7a7e7b330f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-08-04 11:58:11 +02:00
Laurent Destailleur
7f6e2a277a NEW Link between objects can be done on both side and on all objects 2016-08-04 11:57:37 +02:00
florian HENRY
5f415478ac FIX : update limit stock on product stock 2016-08-03 17:29:04 +02:00
Laurent Destailleur
f0c75388cb Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/api_commande.class.php
	htdocs/compta/facture/class/api_invoice.class.php
	htdocs/product/class/api_product.class.php
	htdocs/societe/class/api_contact.class.php
	htdocs/societe/class/api_thirdparty.class.php
 2016-08-02 17:43:12 +02:00
Laurent Destailleur
54df49aebe Fix strict sql 2016-08-02 13:36:16 +02:00
Laurent Destailleur
dfc38351ef Fix $i not initialized 2016-08-01 19:48:39 +02:00
Laurent Destailleur
621a7d93fa Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-08-01 15:05:57 +02:00
Ferran Marcet
fb2444c7a3 Fix: Can't set PRODUIT_LIMIT_SIZE to value 0 2016-08-01 10:20:10 +02:00
Laurent Destailleur
4e3dd4c927 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-28 14:38:22 +02:00
Laurent Destailleur
aae2086ada Move notes on dedicated tabs like other elements. 
Rename also the note available into translation tab into "other" to
avoid confusion because it was not the same usage.
 2016-07-28 13:53:17 +02:00
Laurent Destailleur
629271cf85 FIX Bad position of parameters on llxHeader (so online help not visible) 2016-07-28 12:23:07 +02:00
Laurent Destailleur
e5d0258f33 Fix missing css 2016-07-28 12:22:23 +02:00
Laurent Destailleur
01417b89c3 FIX Bad position of parameters on llxHeader (so online help not visible) 2016-07-28 12:17:00 +02:00
Laurent Destailleur
8b3136cb96 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/companies.lang
 2016-07-27 19:04:55 +02:00
Laurent Destailleur
ee0c77a305 Merge branch 'refactor-rest-api' of 
https://github.com/EuskalMoneta/dolibarr into
EuskalMoneta-refactor-rest-api

Conflicts:
	htdocs/api/admin/explorer.php
 2016-07-27 14:06:14 +02:00
Laurent Destailleur
a167d56d5a Hard code a warning to avoid confusion. 2016-07-26 16:40:37 +02:00
BENKE Charlie
66d0d09769 Add : additionnal origin of mouvement 
Main problem is the difference between folder and the class of project
Maybe one time (for a major version of dolibarr (5, 6 ...) we start to standadisation of all modules
 2016-07-23 16:30:12 +02:00