Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
142,956 Commits 35 Branches 179 Tags 1.7 GiB
develop
Commit Graph

361 Commits

Author SHA1 Message Date
Ferran Marcet
cb5117ad06 Fix: Invalid variable. Shoud be $object 2017-01-25 16:08:46 +01:00
Ferran Marcet
7f87f6688b Fix: Invalid variable. Shoud be $object 2017-01-25 12:58:21 +01:00
Laurent Destailleur
fc4aa96cd7 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/dispatch.php
 2017-01-20 21:02:05 +01:00
Laurent Destailleur
9c60474953 FIX #6277 2017-01-16 11:06:17 +01:00
Laurent Destailleur
82052450a6 Complete work on dol_banner 2016-12-26 18:21:18 +01:00
Laurent Destailleur
d5e417010f Complete work on dol_banner 2016-12-09 11:16:04 +01:00
Laurent Destailleur
c71fc18942 NEW Checkbox 'close order to "Everything received" automatically if all 
products are received' is visible on supplier orders.
 2016-09-12 01:05:45 +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
2133b1c3b5 NEW Table with list of lots/serial can be viewed (module product batch). 2016-08-08 20:31:03 +02:00
florian HENRY
1e929e647d better management of dispatch status 2016-08-05 10:02:36 +02:00
florian HENRY
0780188f4e taking account @eldy remarks 2016-08-05 09:46:17 +02:00
aspangaro
27603b966e Uniformize presentation on supplier order 2016-08-03 08:25:35 +02:00
Laurent Destailleur
e7072185ab Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/comm/propal.php
 2016-05-18 20:47:57 +02:00
Laurent Destailleur
49c2549400 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/comm/propal.php
 2016-05-18 20:40:09 +02:00
Maxime Kohlhaas
af8608ab7a Fix services dispatch on supplier order only if STOCK_SUPPORTS_SERVICES 2016-05-16 10:49:43 +02:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Marcos GarciÌa de La Fuente
89bd173c2f NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate 2016-03-21 21:51:29 +01:00
Marcos GarciÌa de La Fuente
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
fappels
7fc8007571 New add shipping and dispatching from/to multiple warehouses 
Add select2 to warehouse selectors
Ship customer orderline from multiple warehouses
Dispatch client orderline to multiple warehouses
 2015-12-18 18:00:31 +01:00
philippe grand
01c6728aa9 [Qual] Uniformize code 2015-12-08 11:35:08 +01:00
Raphaël Doursenaud
dabfad1529 [Qual] Replaced deprecated print_titre() 2015-09-24 18:27:13 +02:00
Laurent Destailleur
db1d9d6d8e Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/fourn/commande/dispatch.php
 2015-09-12 11:50:46 +02:00
fappels
75a14e02d8 Fix #3471 3.7 Rounding issue when dispatching non-integer 2015-09-10 23:29:13 +02:00
fappels
a294700cef fix dispatch rounding version 1 2015-09-10 22:16:03 +02:00
Alexis Algoud
21f0fc8229 FIX can receive new batch product on supplier order 2015-06-18 19:49:19 +02:00
Raphaël Doursenaud
b8d9c20731 [Qual] Fixed HTML input form disabled attribute 
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form disabled attribute should not have a value.
 2015-05-07 14:21:14 +02:00
Laurent Destailleur
d76c1a9f42 Can filter on serial number into movement list 2015-04-10 12:59:33 +02:00
Laurent Destailleur
787083028b Fix: entered data are not lsot when error 2015-04-10 12:10:05 +02:00
Laurent Destailleur
e01e0faeef Can reopen to edit supplier order once ordered 2015-04-09 16:15:52 +02:00
Laurent Destailleur
ed6f2e9386 Fix error management 2015-04-09 15:14:50 +02:00
Laurent Destailleur
cf0f458a51 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php
	htdocs/langs/el_GR/projects.lang
	htdocs/langs/en_GB/bills.lang
	htdocs/langs/en_GB/main.lang
	htdocs/langs/en_GB/orders.lang
	htdocs/langs/es_AR/bills.lang
	htdocs/langs/es_CO/admin.lang
	htdocs/langs/es_CO/main.lang
	htdocs/langs/es_ES/bills.lang
	htdocs/langs/es_ES/projects.lang
	htdocs/langs/fa_IR/categories.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/other.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/lv_LV/bills.lang
	htdocs/langs/nb_NO/bills.lang
	htdocs/langs/pl_PL/bills.lang
	htdocs/langs/pl_PL/mails.lang
	htdocs/langs/pl_PL/projects.lang
	htdocs/langs/ro_RO/bills.lang
	htdocs/langs/ro_RO/products.lang
	htdocs/langs/ro_RO/projects.lang
	htdocs/langs/ru_RU/bills.lang
	htdocs/langs/ru_RU/projects.lang
	htdocs/langs/sl_SI/main.lang
	htdocs/langs/tr_TR/bills.lang
	htdocs/langs/tr_TR/projects.lang
	htdocs/langs/vi_VN/bills.lang
 2015-04-02 13:57:20 +02:00
Francis Appels
bba8b206a1 FIX: dispatch batch products 
Fix dispatching batch products and add error message.
Make DispatchProduct method backwards comp and add missing $trigger.
Add missing ORDER_SUPPLIER_DISPATCH trigger to demo class.
 2015-03-31 15:48:08 +02:00
Laurent Destailleur
88a29b7c9c Add an advance permission to check/uncheck reception 2015-03-09 20:26:56 +01:00
Laurent Destailleur
56b5bfd25b NEW: Implement option SUPPLIER_ORDER_USE_DISPATCH_STATUS to add a status 
into each dispathing line of supplier order to "verify" a
reception is ok. Status of order can be set to "total/done" only if line
is verified.
 2015-03-08 02:08:26 +01:00
Laurent Destailleur
e55a983c03 Fix td balance 2015-03-06 16:13:09 +01:00
Laurent Destailleur
8a00109baf Fix: Several bugs int replenishment feature. 2015-03-01 16:05:20 +01:00
Laurent Destailleur
560f1a43cd Fix: Several bugs int replenishment feature. 2015-03-01 16:04:34 +01:00
Laurent Destailleur
9842e816d0 Fix bad sql type 
Fix no input outside tr-td
 2015-02-24 11:24:15 +01:00
Laurent Destailleur
eb4eededbd Add class to manage table commande_fournisseur_dispatch 2015-02-24 11:19:47 +01:00
Laurent Destailleur
e3713c8b6d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/admin/tools/eaccelerator.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php
 2015-02-19 00:01:26 +01:00
Gauthier
be56f76743 FIX : Display error on dispatched quantity when we have several times same product in a supplier order 2015-02-12 12:56:21 +01:00
Laurent Destailleur
179cbbd187 Maxi debug and enhancement of module batch. 2015-02-11 22:54:06 +01:00
Laurent Destailleur
fb3cf4da1e New: The comment of the stock movement when making a supplier order 
receiving is also stored into the tracking dispatch table (not only into
stock movement table).
 2015-02-11 15:03:33 +01:00
Laurent Destailleur
b9d2de99e1 Translation 2015-02-11 14:46:16 +01:00
Laurent Destailleur
621976317a Fixed error management 2015-02-10 21:08:02 +01:00
aspangaro
c4c69e191b Replace <center> tags 2014-11-25 20:13:43 +01:00
KreizIT
5e7c0639b0 Refactor: various trigger 2014-07-11 16:02:27 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag 
http://php.net/manual/en/language.basic-syntax.phptags.php
 2014-05-03 18:18:44 +02:00
Laurent Destailleur
b1498c584d Merge branch 'dluo_step5' of https://github.com/KreizIT/dolibarr into 
KreizIT-dluo_step5

Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-03-16 20:49:56 +01:00
KreizIT
9be2bb0e60 Travis Fix 2014-03-16 07:00:27 +01:00
KreizIT
3782742aad - add batch management on supplier dispatch product 
- SECURITY FIX : replace $_GET and $_POST by GETPOST in dispatch.php
 2014-03-15 10:28:01 +01:00
Laurent Destailleur
ea773531b5 Fix: [ bug #1206 ] PMP price is bad calculated 2014-03-01 14:49:30 +01:00
simnandez
b9c8852471 Qual: Improve suppliers orders manual receivings 2013-11-14 17:08:59 +01:00
Grand Philippe
b599481ef6 standardize code 2013-06-20 09:18:12 +02:00
Maxime Kohlhaas
83def2cd57 Fix : on a new trigger, using $this but not in a class... 2013-03-25 18:03:42 +01:00
Laurent Destailleur
4e029bf2ca Fix: Security does not need special case 2013-03-24 21:06:45 +01:00
Maxime Kohlhaas
cd5bda27f4 Supplier dispatch : add new trigger called after order is dispatched 2013-02-25 16:56:37 +01:00
Regis Houssin
5740c7e694 Fix: change for a neutral email 2012-12-30 15:11:07 +01:00
Regis Houssin
e19f8c54f1 Fix: strict mode hurricane 2012-09-15 10:01:35 +02:00
Marcos GarciÌa
4209898d20 Lower-cased Header function 2012-08-31 05:58:38 +02:00
Marcos GarciÌa
f3674317ec Removed parenthesis from all require and replaced with single quotes 2012-08-22 23:24:21 +02:00
Marcos GarciÌa
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Laurent Destailleur
2f0a88ce69 [ bug #480 ] Can't receive to stock with strict mode 2012-08-07 19:32:51 +02:00
Regis Houssin
cd3452d71d Fix: multicompany sharings and uniformize code 2012-02-11 10:18:09 +01:00
Laurent Destailleur
95a292f41b Fix: Update licence files 2011-12-17 21:58:44 +01:00
Regis Houssin
f0c327c070 Fix: uniform code 
replace all $html by $form with exceptions "$htmlname, $htmltooltip"
 2011-11-08 17:22:31 +08:00
Regis Houssin
3338649316 [task #217] Move core files in core directory 2011-10-24 14:11:49 +02:00
Regis Houssin
56d6cbe56f [task #216] Move lib in core directory 2011-10-24 12:59:44 +02:00
Regis Houssin
2c1b3722f2 Fix: replace sizeof() by count() 2011-09-17 19:49:50 +00:00
Laurent Destailleur
2bb5e4ba69 Fix: W3C 2011-08-31 15:12:09 +00:00
Regis Houssin
2ecc03104c Fix: remove obsolete tags (in progress) 2011-08-27 15:14:31 +00:00
Regis Houssin
726d9581dd Fix: remove obsolete tags (in progress) 2011-08-27 14:24:16 +00:00
Laurent Destailleur
edd91b7d26 Qual: Clean stock increase/decrease code 2011-05-23 23:46:39 +00:00
Juanjo Menent
d793f8d250 task #8618: reverse improved supplier directory structure 2010-09-29 13:59:17 +00:00
Juanjo Menent
fc48d1888f task #8618: improved supplier directory structure 2010-09-28 16:24:25 +00:00
Laurent Destailleur
81c2b485c8 New: Can add a comment on stock dispatching to be saved into the stock movement. 2010-08-26 15:46:39 +00:00
Laurent Destailleur
76a7e8f424 Add more units 2010-08-26 14:49:40 +00:00
Regis Houssin
9601f8a353 Fix: $optiontype not used 
Fix: select_array is deprecated
 2010-08-19 15:13:17 +00:00
Laurent Destailleur
1315833247 Minor fixes. 2010-07-11 19:29:18 +00:00
Laurent Destailleur
c0521a20a9 Qual: Remove deprecated code 2010-06-17 16:53:26 +00:00
Laurent Destailleur
1083d5ca8b Serious debug of supplier order process 2010-05-28 21:52:51 +00:00
Laurent Destailleur
38d91e99dd New: Add a new mode for automatic stock increase: Can be increased on supplier order dispatching of products. 2010-05-28 20:41:41 +00:00
Laurent Destailleur
83aebbb2ce Fix: Removed a duplicate permission 2010-05-12 12:41:38 +00:00
Laurent Destailleur
e4bba520f7 Now fetch for User class use id like other classes. 2010-05-05 17:36:20 +00:00
Philippe Grand
b749e6bdcf according to new tree directory 2010-04-29 14:34:21 +00:00
Philippe Grand
391c595dda according to new tree directory 2010-04-29 08:50:46 +00:00
Philippe Grand
3f4bee1f18 according to new tree directory 2010-04-28 12:53:28 +00:00
Philippe Grand
a6edf971de fix : class not found 2010-04-09 09:04:28 +00:00
Laurent Destailleur
839ceebfc7 Remove pre.inc.php 2010-03-27 15:06:19 +00:00
Regis Houssin
6822a1b18b Fix: uniformise and clean code 2010-03-11 14:31:16 +00:00
Regis Houssin
3c74bd21ca Works on enhancement of project tasks 
Fix: move class in directory of module
 2010-01-22 20:20:41 +00:00
Regis Houssin
9836445850 Fix: utf-8 2009-12-14 22:26:57 +00:00
Regis Houssin
37c2825f93 Fix: functions "ereg", "ereg_replace", "eregi", "eregi_replace" is deprecated since php 5.3.0 2009-10-22 15:09:04 +00:00
Laurent Destailleur
51e13e1568 New: Add picto on tab titles 2009-08-06 14:44:24 +00:00
Regis Houssin
e5d222b6cc Fix: régression sur l'utilisation des niveau du jeton, on test sur les 2 niveaux car 
comportement aléatoire avec certaines fonctions
 2009-05-17 08:01:54 +00:00
Regis Houssin
c1c1f8a4d2 Fix: ajout d'un niveau supplémentaire du cache du jeton 2009-05-16 15:45:26 +00:00
Regis Houssin
35072b99bf Fix: ajout d'un jeton aléatoire dans les requetes POST 2009-05-15 14:56:03 +00:00
Regis Houssin
b86684805c New: early development of multi-company module 2009-04-27 20:37:50 +00:00
Laurent Destailleur
0823322ba1 Qual: All call to dolibarr_ functions are made on dol_ functions. 2009-02-20 22:53:15 +00:00
Laurent Destailleur
23eb5d2c2d Add navigation bar on supplier orders 2009-01-31 00:06:19 +00:00
Laurent Destailleur
0a32a7cd5f Can attach files on supplier orders 2008-11-24 20:09:23 +00:00
Laurent Destailleur
21d56aa8a1 Qual: Reduce memory required by 2% 2008-11-16 01:54:33 +00:00
Laurent Destailleur
d4fdb23618 Move all modules into includes/modules directory 2008-10-25 23:19:30 +00:00
Laurent Destailleur
3e71a86acd Fix: Ventilation des commandes fournisseurs bloqués si status "livré" mis avant validation 2008-06-14 10:01:31 +00:00
Regis Houssin
6eb9b15bd9 Fix: Suppression champ "price" obsolete 2008-05-23 12:35:19 +00:00
Laurent Destailleur
fed065dd7f Qual: Nettoyage de code redondant. L'appel a getright est inutile car deja dans le main. 2008-01-29 19:03:26 +00:00
Regis Houssin
46b4c7ff57 Fix: on n'affiche pas les produits personnalisés 2007-12-17 12:14:50 +00:00
Laurent Destailleur
facf08d676 Uniformisation du mode d'appel de dolibarr_print_date 2007-06-16 13:56:05 +00:00
Regis Houssin
f96309e542 Fix: l'onglet "ventilation commande" n'apparaissait pas dans l'onglet "note" et "suivi" 2006-12-20 11:19:26 +00:00
Rodolphe Quiedeville
70c8a0d21a Synchro 2006-12-13 14:48:46 +00:00
Rodolphe Quiedeville
8a7ae586c1 Nouveau fichier 2006-12-11 20:52:01 +00:00