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
112,767 Commits 35 Branches 179 Tags 1.7 GiB
e3a0220658
Commit Graph

1965 Commits

Author SHA1 Message Date
TuxGasy
9c3805c0d5 Fix anchor after add line 2017-10-19 14:10:58 +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
Scrutinizer Auto-Fixer
bd5bffa72c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-16 06:47:05 +00:00
Laurent Destailleur
4296df45af Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/projet/list.php
	htdocs/user/card.php
 2017-10-13 22:01:56 +02:00
Laurent Destailleur
7c9993ef0e Various fixes 2017-10-13 12:14:57 +02:00
Laurent Destailleur
8c5cf9ea45 Fix date output 2017-10-12 18:04:47 +02:00
Laurent Destailleur
68ec8ef313 Fix lang missing 2017-10-11 12:05:48 +02:00
Scrutinizer Auto-Fixer
328d39bc71 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-07 11:09:31 +00:00
Laurent Destailleur
f9d9642340 FIX #6981 2017-10-06 14:07:28 +02:00
Laurent Destailleur
d28188d19d FIX Generation of invoice from bulk action "Bill Orders" 
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
 2017-10-04 14:31:52 +02:00
Laurent Destailleur
a74d6074a3 FIX Generation of invoice from bulk action "Bill Orders" 2017-10-04 14:27:10 +02:00
Laurent Destailleur
9d6498f2a4 NEW Search filters in lists are restored when using "back to list" 2017-10-03 14:50:52 +02:00
Laurent Destailleur
03c08b1de4 Merge pull request #7507 from dolibarr95/patch-20 
Line missing (error 500)
 2017-10-02 00:10:03 +02:00
Laurent Destailleur
f007f9e7e5 NEW Add new property visible dy default on lists on extrafields 2017-09-29 13:26:44 +02:00
dolibarr95
3849da4fe4 Line missing (error 500) 
Create an instance of ProductFournisseur.
 2017-09-27 09:09:38 +02:00
Laurent Destailleur
d232f8e3d5 Merge pull request #7500 from dolibarr95/patch-19 
Try to fix 7492
 2017-09-26 20:57:37 +02:00
Laurent Destailleur
7cf1a41853 Try to replace error into warning, so we can still make the order if qty too low 2017-09-26 20:57:09 +02:00
fappels
7d965f58d6 Clean code 2017-09-26 16:21:28 +02:00
dolibarr95
7b106bc642 Try to fix 7492 
check if enough quantity
 2017-09-26 14:13:11 +02:00
Laurent Destailleur
c9e9f60f8f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-09-25 19:55:52 +02:00
Laurent Destailleur
e3da4188e2 GETPOST must not clean data for text input. 2017-09-25 00:16:52 +02:00
Laurent Destailleur
270aba99fa FIX #7471 2017-09-24 23:28:48 +02:00
Laurent Destailleur
934edd9f5a Merge branch 'develop' into 6.0-api 2017-09-24 22:01:07 +02:00
Regis Houssin
77fea1983c Fix: wrong supplier product price id 2017-09-20 16:57:38 +02:00
Laurent Destailleur
ab5724e7ff Mutualize code for forms to send emails. Remove thousand line of code. 2017-09-17 17:12:14 +02:00
Laurent Destailleur
432df8eacf NEW Enabled sending email in bulk actions for supplier orders 2017-09-16 20:31:33 +02:00
Laurent Destailleur
630dc92a13 NEW Mass PDF Merging is available on contracts 2017-09-16 15:39:52 +02:00
Laurent Destailleur
0873260b8a USe second parameter in GETPOST 2017-09-15 10:50:50 +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
71ce82b6b9 NEW Better autoselect customer or supplier fields to save clicks 2017-09-12 16:51:10 +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
Laurent Destailleur
bde293af22 Fix filter on extrafield with type sellist 2017-09-07 15:34:25 +02:00
Laurent Destailleur
7aa09d8b71 NEW Can create thirdparty from card proposal, order or invoice 2017-08-28 18:37:16 +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
Laurent Destailleur
52a8692a85 FIX #7226 2017-08-23 16:07:11 +02:00
Laurent Destailleur
4da49dfc2d FIX #7239 2017-08-23 15:02:38 +02:00
Laurent Destailleur
4d26dffa7d FIX No way to add new line in supplier orders 2017-08-13 23:17:34 +02:00
Laurent Destailleur
5b1f5b0f20 Fix translation done twice into field title of array 2017-08-02 13:31:53 +02:00
Laurent Destailleur
aa9b4ce1f3 Fix too long combo for tags 2017-07-25 09:49:08 +02:00
Laurent Destailleur
2870798d07 Fix remove warnings 2017-07-13 00:35:10 +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
bd0dba6439 Update card.php 
Better fix for future
 2017-07-07 20:14:47 +02:00
jfefe
a072b23a5e FIX #7075 : bad path for document 2017-07-06 00:47:26 +02:00
KHELIFA
62f8aa8b40 Fix: In supplier order, show link Now for order date and delivery date 2017-06-29 16:49:30 +02:00
Laurent Destailleur
6f82837b0f Fix GETPOST of lang_id 2017-06-27 17:27:01 +02:00
Laurent Destailleur
77ba5a8c24 Fix reception of product interface 2017-06-27 14:02:01 +02:00
Laurent Destailleur
4102403482 Look and feel v6 2017-06-21 11:37:34 +02:00
Laurent Destailleur
08a86fa03d Start #6981 2017-06-20 12:17:13 +02:00
Laurent Destailleur
bb2d27280b Fix sort link must be disabled for computed field 2017-06-19 14:31:08 +02:00
Laurent Destailleur
1b56e4a01c Fix look and feel v6 2017-06-14 11:28:42 +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
0e867229db FIX Can't create invoice if PO disapproved 2017-06-14 10:28:02 +02:00
Laurent Destailleur
7939daa225 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
	htdocs/user/index.php
 2017-06-14 10:18:24 +02:00
Laurent Destailleur
83a5b8e078 FIX Can set supplier invoice to billed. 2017-06-14 10:13:33 +02:00
Laurent Destailleur
a96362e2f9 Fix #formmailbeforetitle not supported everywhere 2017-06-11 11:40:01 +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
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
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
Laurent Destailleur
02b5d9e6f7 FIX #6945 2017-06-06 10:53:53 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
Laurent Destailleur
b3dc73e611 Look and feel v6 2017-05-21 02:43:51 +02:00
Laurent Destailleur
aec4cef5de Clean some code for type of event deprecated since 3.3 2017-05-19 12:58:38 +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
68e333879f Fix var not sanitized 2017-05-16 13:27:32 +02:00
Alexandre SPANGARO
93554b7e30 Typo searchpicto 2017-05-14 21:06:33 +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
Laurent Destailleur
ce05c74e47 NEW SUPPLIER_ORDER_EDIT_BUYINGPRICE_DURING_RECEIPT 2017-05-04 17:48:52 +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
26a9999fbf Support of preview for pdf with several pages 2017-04-12 11:38:55 +02:00
Laurent Destailleur
52c86cb3f5 NEW Bulk actions available on supplier orders 2017-04-09 13:12:25 +02:00
Laurent Destailleur
be439f6252 Work on look and feel v6 2017-04-07 16:16:44 +02:00
Laurent Destailleur
d99b0461c7 Extrafields multilanguage support. 2017-04-03 10:56:28 +02:00
Laurent Destailleur
e416ea275e Work on 6.0 look and feel 2017-03-28 21:04:38 +02:00
Laurent Destailleur
106d19a8af FIX #6468 + Fix missing translation 2017-03-25 03:53:11 +01:00
Laurent Destailleur
f241bfefd0 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-23 20:20:59 +01:00
Laurent Destailleur
2062047dea Merge pull request #6555 from atm-gauthier/5.0_fix_originid_on_supplierorder 
FIX : origin & origin id on supplier order line
 2017-03-23 20:03:58 +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
7df9c25e60 Several fixes on multicurrency 2017-03-23 12:44:20 +01:00
gauthier
a790ef9f7c FIX : origin & origin id on supplier order line 2017-03-23 12:35:43 +01:00
Laurent Destailleur
ac19aba07e FIX multicurrency management on supplier order/invoice 
Conflicts:
	htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php
 2017-03-19 15:41:55 +01:00
Laurent Destailleur
e85206dee5 FIX multicurrency management on supplier order/invoice 2017-03-19 15:37:07 +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
Juanjo Menent
5c028b30d5 Fix #6512 Bug: Invalid argument in when submitting orderstoinvoice.php-form 2017-03-17 17:05:59 +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
Laurent Destailleur
184d52525a PHP code to manage pair/impair is replaced by native CSS. 2017-03-07 22:45:22 +01:00
Laurent Destailleur
d38818ff11 Fix option PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS not correctly 
supported.
 2017-03-06 13:01:04 +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
e1a6e6e4ab Rename "attributes" into "variants" to avoid confusion with extrafields 2017-02-08 12:37:38 +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
cd6f5fb8cb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-02 02:26:09 +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
f6144b9ecb Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-02-02 02:24:57 +01:00
Laurent Destailleur
672e81d466 Merge pull request #6352 from philippe-opendsi/develop 
NEW Option to reload supplier order and invoice create  page
 2017-02-02 01:23:53 +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
fbbf8cd8a4 Fix bad side effect of uniformizing a constant name. 2017-02-01 15:47:08 +01:00
Laurent Destailleur
d945a0de92 NEW Uniformize behaviour: Action to make order is an action button. 2017-02-01 14:59:51 +01:00
philippe-opendsi
399aea179f New : Option to reload supplier order and invoice to retrieve payment terms & type 
Add RELOAD_PAGE_ON_SUPPLIER_CHANGE
 2017-01-31 10:15:04 +01:00
arnaud
c79137d14c FIX Supplier Order list filter by project 2017-01-30 17:29:01 +01:00
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
7a0d388073 Fix if not defined, set default value from constant 2017-01-17 11:53:28 +01:00
Laurent Destailleur
9c60474953 FIX #6277 2017-01-16 11:06:17 +01:00
Laurent Destailleur
d14e4dbaba Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on 2017-01-15 20:49:20 +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
b642a3a602 Prepare release 5.0 2016-12-31 16:35:56 +01:00
Marcos García de La Fuente
47a444b2ab Merge branch 'develop' into prod-attr 2016-12-27 15:54:53 +01:00
Laurent Destailleur
82052450a6 Complete work on dol_banner 2016-12-26 18:21:18 +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
Laurent Destailleur
60b8582aa9 Fix more then 30 security defects 2016-12-18 01:44:26 +01:00
Laurent Destailleur
6c4f15df63 Fix lot of fix in css look to match v5 rules. 2016-12-11 16:11:42 +01:00
Maxime Kohlhaas
f7524b93ad Actualize currency on supplier order and invoice 2016-12-11 02:50:21 +01:00
Maxime Kohlhaas
3d2143809b Multicurrency on supplier order and invoice 2016-12-11 02:09:57 +01:00
Maxime Kohlhaas
707ca379c9 Fix currency on supplier order creation 2016-12-10 23:57:26 +01:00
Laurent Destailleur
bed23483d6 Merge pull request #6094 from benlo06/fix_list_fourn 
Fix missing column in supplier list
 2016-12-10 11:43:09 +01:00
Alexis Algoud
73f5254159 FIX #6031 search on login but fullname displayed 2016-12-10 11:35:34 +01:00
Laurent Destailleur
d5e417010f Complete work on dol_banner 2016-12-09 11:16:04 +01:00
Benoit
9f51691ae4 Fix bug on fournisseur list 2016-12-09 00:15:59 +01:00
Laurent Destailleur
761a795294 Maxi debug on REST APIs 2016-12-05 13:31:29 +01:00
Laurent Destailleur
bd8f923cee Several fixes in filter on lists 2016-11-29 22:52:16 +01:00
Laurent Destailleur
e59edca855 Fix Responsive design 2016-11-27 20:55:59 +01:00
Marcos García de La Fuente
cf0ee36150 Merge branch 'develop' into prod-attr 
# Conflicts:
#	htdocs/core/class/html.form.class.php
#	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2016-11-27 18:10:01 +01:00
Laurent Destailleur
18a1f9033c Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/api/class/api_generic.class.php
	htdocs/api/index.php
 2016-11-27 16:25:38 +01:00
Laurent Destailleur
e4a8342aef Fix div-table-form balance on all lists (solve responsive design) 2016-11-27 11:41:10 +01:00
Laurent Destailleur
16ce156631 Fix responsive design 2016-11-25 18:32:52 +01:00
Regis Houssin
0322104e8e Fix: use string instead integer 2016-11-24 17:27:32 +01:00
Laurent Destailleur
5acd09b2d5 Fix require_once instead of require. 2016-11-24 17:03:18 +01:00
Laurent Destailleur
ad981a0f07 FIX the key for getEntity was different for same element. 2016-11-18 12:54:08 +01:00
Laurent Destailleur
5539415354 FIX Remove hard coded value '1' for default payment term id. Use quick 
hack by adding hidden constant to avoid this.
 2016-11-15 10:43:03 +01:00
Laurent Destailleur
66ff139030 Fix travis 2016-11-10 18:03:35 +01:00
Laurent Destailleur
d1446bb7ef NEW Show subtotal into list of linked elements 2016-11-08 19:19:30 +01:00
Marcos García de La Fuente
286095f5cd Merge branch 'develop' into prod-attr 
# Conflicts:
#	htdocs/core/class/html.form.class.php
#	htdocs/core/tpl/objectline_create.tpl.php
#	htdocs/fourn/facture/card.php
#	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-11-06 15:01:40 +01:00
gauthier
7d63925118 NEW : param socid find_min_price_product_fournisseur() function 2016-10-18 15:35:48 +02:00
Laurent Destailleur
dfbca2d0ad Merge pull request #5868 from olsesacl/#5830 
NEW: #5830 Allow Generic E-mail Sender
 2016-10-15 02:43:19 +02:00
Laurent Destailleur
d27dea8320 NEW Can rename uploaded or generated files on all "documents" tabs. 2016-10-14 18:09:24 +02:00
Sergio Sanchis Climent
8556dab68e NEW: #5830 2016-10-13 16:44:17 +02:00
Laurent Destailleur
265131e815 Remove old comments 2016-10-04 12:54:02 +02:00
Laurent Destailleur
6ac39b97e4 Fix restore list of attached files into action report 2016-10-03 00:38:28 +02:00
Laurent Destailleur
ea09eb13da Uniformize code 2016-09-26 00:10:29 +02:00
Laurent Destailleur
c4c7ccc226 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/societe/note.php
	htdocs/societe/rib.php
 2016-09-19 14:05:16 +02:00
Laurent Destailleur
4f842fd2cb Uniformize look and feel 2016-09-19 13:57:50 +02:00
Laurent Destailleur
0ab377440d Complete param of setValueFrom 2016-09-12 20:16:39 +02:00
Laurent Destailleur
d6ea6d1725 Fix deprecated option should be on 2016-09-12 02:30:21 +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
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
1bb278a587 Fix #5712 2016-09-11 23:01:04 +02:00
Laurent Destailleur
1b00d55021 NEW New set of icon for status easier to understand. 2016-09-10 17:57:35 +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
0debcf745a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/cron/card.php
	htdocs/cron/list.php
	htdocs/filefunc.inc.php
 2016-09-09 09:32:14 +02:00
aspangaro
2b43eb934f Fix: Problem of presentation with index supplier command 2016-09-07 22:25:37 +02:00
Marcos García de La Fuente
05728075d6 Merge branch 'develop' into prod-attr 
# Conflicts:
#	htdocs/core/class/html.form.class.php
#	htdocs/core/tpl/objectline_create.tpl.php
#	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
#	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2016-09-06 21:06:33 +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
florian HENRY
5bb3b5c074 FIX : MULTICURRENCY if value is 1,56 then GETPOST 'int' check return '' 2016-08-10 09:47:25 +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
Laurent Destailleur
126d9ae6bf Merge pull request #5586 from atm-florian/dev_NEW_ClassOrderDeliverStatusOnStockVentil 
NEW : Add workflow to calculated supplier order status on stock dispatch
 2016-08-05 18:15:04 +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
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
Laurent Destailleur
33d12a4492 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/admin.lang
 2016-08-05 01:15:19 +02:00
Laurent Destailleur
9349f27742 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-08-04 17:10:02 +02:00
Laurent Destailleur
5126786d60 NEW Add option SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED 2016-08-04 15:48:34 +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
aspangaro
27603b966e Uniformize presentation on supplier order 2016-08-03 08:25:35 +02:00
Laurent Destailleur
abbe204c97 Fix design of option PROJECT_ADD_SUBTOTAL_LINES 2016-08-03 01:42:05 +02:00
Laurent Destailleur
857de64607 Fix multicurrency 2016-07-30 16:41:10 +02:00
Marcos García de La Fuente
c082505021 NEW Added product attributes feature 2016-07-24 11:27:52 +02:00
Laurent Destailleur
061ccadd03 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/commande/list.php
	htdocs/fourn/commande/orderstoinvoice.php
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions
	htdocs/install/pgsql/functions/functions.sql
 2016-07-06 15:11:29 +02:00
Laurent Destailleur
a8f06d78b1 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/install/pgsql/functions/functions.sql
 2016-07-06 14:53:05 +02:00
fmarcet
50c5efc374 Fix: Don't load extrafields on orderstoinvoice 2016-07-05 16:41:46 +02:00
Frédéric FRANCE
0639bafa6b Update list.php 2016-07-02 10:19:38 +02:00
Laurent Destailleur
9b1caefbf9 Fix bad var 2016-06-28 02:40:42 +02:00
Laurent Destailleur
2767df2e01 FIX Solve problem of sending joinded files of another email when several 
tabs are opened on form to send emails.
 2016-06-24 16:10:52 +02:00
Laurent Destailleur
8187dc2006 Fix css 2016-06-19 16:07:34 +02:00
Laurent Destailleur
5db6bcd4a8 Fix contextpage lost on submitting form or sorting 2016-06-07 14:06:00 +02:00
Laurent Destailleur
2918dcfde4 Fix missing include 2016-06-06 17:25:44 +02:00
Laurent Destailleur
293c8e145a Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/imports/import.php
	htdocs/langs/en_US/admin.lang
 2016-06-05 02:20:27 +02:00
Laurent Destailleur
eb7a4c5ccf FIX Creating a supplier order from proposal order 2016-06-04 02:39:13 +02:00
Laurent Destailleur
32b6766a7d FIX #5195 2016-06-04 01:50:01 +02:00
Laurent Destailleur
5c36aa3802 Merge pull request #5271 from aschio/develop 
FIX #5192
 2016-06-04 00:17:45 +02:00
cla
deb7c407ad FIX #4643 2016-06-04 00:08:13 +02:00
Laurent Destailleur
a587ba496c NEW Can select fields on supplier orders 2016-05-24 18:43: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
f901453a6b FIX addMoreActionsButtons hook must be inside the div class=tabaction. 2016-05-05 21:38:29 +02:00
Laurent Destailleur
c795803da1 FIX ref_supplier was not set. We also refered to old var names. 2016-05-05 20:19:56 +02:00
Laurent Destailleur
8a8e7cdf5e Merge pull request #4686 from bafbes/abb-10 
New + Fix : handle supplier orders from customer orders with id variable name correction
 2016-05-05 20:07:42 +02:00
Laurent Destailleur
bfc5be1aad FIX Fix and move dolGetFirstLine function into main 
FIX Hang on ->client not defined
 2016-04-22 19:07:32 +02:00
Laurent Destailleur
1de36d6501 Merge pull request #5011 from altatof/supplierorder_noprice 
NEW hidden feature: SUPPLIERORDER_WITH_NOPRICEDEFINED
 2016-04-22 18:27:42 +02:00
Marcos García de La Fuente
e2c86d3fd8 NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead 2016-04-17 15:24:22 +02:00
Christophe Battarel
ec5e0e5290 forgot one line 2016-04-15 12:32:36 +02:00
Christophe Battarel
c3d4cd85f1 NEW hidden feature: SUPPLIERORDER_WITH_NOPRICEDEFINED allow supplier 
order even if no supplier price defined
 2016-04-15 12:28:35 +02:00
Laurent Destailleur
8d46d76f96 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/facture/paiement.php
 2016-04-12 15:05:18 +02:00
Laurent Destailleur
e61c83d708 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/fourn/facture/paiement.php
 2016-04-12 15:03:19 +02:00
Laurent Destailleur
357877b1fe Debug multicurrency and clean properties of some modules 2016-04-12 14:45:59 +02:00
Marcos García de La Fuente
865f9defff FIX #4424 Missing email of user popup in supplier orders area 
Close #4424
 2016-04-09 23:08:47 +02:00
Laurent Destailleur
27217ccccd Maxi debug of supplier order workflow. 
Add trigger ORDER_SUPPLIER_CLASSIFY_BILLED
Parameter user is added so it is defined into triggers.
 2016-04-09 18:51:09 +02:00
Laurent Destailleur
b9ffc18c27 Uniformize log of supplier order. Now use the generic log feature. 2016-04-08 17:28:48 +02:00
Laurent Destailleur
04a85ff831 FIX Substitution key on email of supplier order was broken 2016-04-08 16:06:50 +02:00
Laurent Destailleur
086345490d Generalize the set of trackid for everyemail sent by dolibarr. 2016-04-07 14:29:07 +02:00
Laurent Destailleur
7f129d14d7 Better responsive design 2016-04-07 14:08:38 +02:00
Laurent Destailleur
e1bec46a34 FIX The include file for action on files should not be a template file 
but an action include file.
 2016-04-02 14:16:16 +02:00
Laurent Destailleur
e40b678d7b Uniformize code 2016-04-01 16:29:47 +02:00
Laurent Destailleur
97b5026ad8 Uniformize code and css 2016-04-01 16:18:45 +02:00
Laurent Destailleur
2d9c53fc26 NEW Merge all boxes "related objects" into one. This save a lot of room 
on most card and avoid often horizontal scoll.
 2016-03-30 19:18:31 +02:00
Laurent Destailleur
e79633fa8d Fix search on supplier orders 2016-03-30 11:03:39 +02:00
Laurent Destailleur
abcbc5c0da Fix limit management 2016-03-30 10:45:14 +02:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Laurent Destailleur
630f5a632d Revert "Corrected non-static usages of Form::selectarray function" 
This reverts commit 87cd6e1e40.
 2016-03-25 15:34:37 +01:00
Laurent Destailleur
8ecfca5a9e Revert change that break compatiblity with 100% of modules 2016-03-25 15:26:46 +01:00
Laurent Destailleur
26de415b77 Revert commit that break compatibility of 100% of modules 2016-03-25 15:24:57 +01:00
Marcos Garcí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 García de La Fuente
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
ff6b187ef3 NEW Converted Form::showLinkedObjectBlock to a static function 2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
4d78932fe8 NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions 2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
87cd6e1e40 Corrected non-static usages of Form::selectarray function 2016-03-20 14:15:17 +01:00
Laurent Destailleur
446a080c75 NEW Mutualize code to manage email substitution variables. Show 
available variables into page to edit email templates.
 2016-03-05 12:20:58 +01:00
Laurent Destailleur
0f9afea1cc Merge pull request #4731 from IonAgorria/unset-date-post 
Fix: unset date start/end at success
 2016-03-04 16:20:10 +01:00
Ion Agorria
a1159b6f29 Fix: unset date start/end at success 2016-03-04 14:11:06 +01:00
Maxime Kohlhaas
db656ea4ca New : add button to create event on supplier order or invoice with MAIN_ADD_EVENT_ON_ELEMENT_CARD 2016-03-04 10:38:33 +01:00
Laurent Destailleur
3a58613e45 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/listbyyear.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/compta/facture/list.php
	htdocs/filefunc.inc.php
	htdocs/fourn/facture/list.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/projet/activity/index.php
 2016-03-02 23:40:11 +01:00
Laurent Destailleur
a26f880843 Fix missing declarion of form 
Fix by adding MAIN_USE_OLD_SEARCH_FORM to restore a way for backward
compatibility
Fix to have delay for payment term at least 1 day (to avoid immediate
warning after creation of an invoice)
 2016-03-01 00:59:42 +01:00
Laurent Destailleur
8807222f24 Fix a lot of fixes to have the french vat npr working better 2016-02-27 12:22:39 +01:00
Laurent Destailleur
c86a1a30d5 Fix a lot of fixes to have the french vat npr working better 2016-02-27 11:46:16 +01:00
Bahfir Abbes
4cbc1539b9 Fix: displays error when the supplier price does not exist. 2016-02-26 22:48:01 +01:00
abb
5e2261c9bd handle customer orders from supplier orders with id variable name correction 
Conflicts:
	htdocs/fourn/commande/card.php
 2016-02-26 01:26:16 +01:00
Laurent Destailleur
f6d1913bb7 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2016-02-22 13:35:46 +01:00
Laurent Destailleur
7ba6754a55 Fix the missing button to record reception 2016-02-18 00:27:35 +01:00
phf
e24a35b904 New add multicurrency on supplier proposal/order 2016-02-16 23:58:21 +01:00
Laurent Destailleur
158906455a NEW Can change dynamically number of records visible into lists. 2016-02-11 20:40:33 +01:00
Laurent Destailleur
9da0164d90 Uniformize code for lists 2016-02-07 15:50:48 +01:00
Laurent Destailleur
99b2236260 FIX Selection of project must no show closed project 2016-01-28 12:19:13 +01:00
Laurent Destailleur
df4cd3de17 FIX Selection of project must no show closed project 2016-01-28 12:05:14 +01:00
Laurent Destailleur
467dc12a7b NEW Module "Supplier commercial proposal" (price request) is set to 
stable status.
 2016-01-25 12:33:38 +01:00
Laurent Destailleur
4df584e57b Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/lib/files.lib.php
 2016-01-23 11:51:56 +01:00
Laurent Destailleur
dbaa43f3be Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/holiday/card.php
	htdocs/holiday/list.php
	htdocs/user/card.php
 2016-01-23 11:45:39 +01:00
Laurent Destailleur
dc438792f4 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/fourn/commande/card.php
 2016-01-23 11:39:37 +01:00
Regis Houssin
905f9d78ed Fix: $outputlangs is not defined (dolibarr 3.7, 3.8, 3.9) 2016-01-15 13:12:19 +01:00
fappels
51b08f579b Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_multi_warehouse 
Fix Conflicts:
 2016-01-12 13:56:00 +01:00
Laurent Destailleur
f25a9030eb Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	.travis.yml
	htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
	htdocs/core/modules/commande/doc/pdf_proforma.modules.php
	htdocs/includes/adodbtime/adodb-time.inc.php
	htdocs/langs/en_US/accountancy.lang
 2015-12-18 22:12:03 +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
Laurent Destailleur
84ee18a11b Fix bad management of second level approvement 2015-12-14 10:33:18 +01:00
Laurent Destailleur
3bcdc5c9c0 Merge pull request #4181 from grandoc/develop 
[Qual] Uniformize code
 2015-12-10 13:35:44 +01:00
philippe grand
01c6728aa9 [Qual] Uniformize code 2015-12-08 11:35:08 +01:00
Ion Agorria
1dc5854535 Fix date handling for hours/mins in some pages 2015-12-07 03:59:03 +01:00
Laurent Destailleur
c55d11869b Billing of supplier or customer order is a process that can be done in 
parallel with shipment or reception, so we show the status on another
field into lists.
 2015-11-29 15:54:32 +01:00
Laurent Destailleur
5df193ec93 Uniformize code 2015-11-28 20:25:50 +01:00
Laurent Destailleur
88e76dcf64 Fix utf8 encoded twice 2015-11-28 14:40:23 +01:00
Alexis Algoud
55b23c4918 FIX add billed field in supplier order 2015-11-16 14:55:46 +01:00
Laurent Destailleur
6bd6be0912 Debug and rename experimental module "supplier proposal". Still work to 
do: Must fix the PDF to be compliant with a request quotation to a
supplier (so no need to show vat, unit price, ...).
 2015-11-15 19:23:39 +01:00
Laurent Destailleur
b2285ca5e0 Option MAIN_EMAIL_ADD_TRACK_ID is now set to 1 by default. 
All emails sent from Dolibarr have a dedicated tracking id.
 2015-11-12 21:25:01 +01:00
frederic34
a597d6c379 allow chaining 2015-11-07 10:23:56 +01:00
frederic34
becce332dd allow chaining and remove header exit 2015-11-07 09:52:00 +01:00
Laurent Destailleur
e26940ddf7 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/core/lib/admin.lib.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/install/filelist.xml
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
	htdocs/societe/price.php
 2015-11-05 01:50:30 +01:00
Laurent Destailleur
df4f09e72f FIX #3240 2015-11-03 14:02:36 +01:00
Laurent Destailleur
da0aa2f937 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
	htdocs/langs/en_US/main.lang
	htdocs/product/list.php
	htdocs/product/stock/mouvement.php
 2015-11-02 19:31:42 +01:00
Laurent Destailleur
d8796e4cc7 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/product/stats/commande.php
	htdocs/product/stats/commande_fournisseur.php
	htdocs/product/stats/facture.php
	htdocs/product/stats/facture_fournisseur.php
	htdocs/product/stats/propal.php
 2015-11-02 19:25:51 +01:00
Laurent Destailleur
a9ddcc1a80 Merge pull request #3832 from frederic34/patch-16 
NEW Add supplier order to the Direct Printing System
 2015-11-02 11:27:00 +01:00
Laurent Destailleur
2c682022cf NEW The search box and the bookmarks are now rendered by the menu 
manager.
 2015-10-30 09:36:57 +01:00
Laurent Destailleur
6cc3df7e71 NEW Quick searh filter works on invoice, proposal, order, intervention, 
contract
 2015-10-30 08:35:56 +01:00
Frédéric FRANCE
ff9648eed9 Update card.php 2015-10-29 19:09:37 +01:00
atm-robin
29b8919a40 FIX supplier rights for orderToInvoice 2015-10-26 14:34:46 +01:00
philippe grand
1762b3aaa7 [Qual] Uniformize code 2015-10-17 17:09:34 +02:00
Laurent Destailleur
2122d4d43a NEW Contract module can be used to follow both sold and bought 
contracts/recurring subscriptions.
 2015-10-17 00:52:35 +02:00
Laurent Destailleur
b3491ef4e5 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/admin/facture_cust_extrafields.php
	htdocs/compta/facture/admin/facturedet_cust_extrafields.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
 2015-10-16 10:12:36 +02:00
Laurent Destailleur
80bd563fde Use GETPOST 2015-10-11 20:41:06 +02:00
Laurent Destailleur
1f742c7464 FIX Add a test to save life when ref of object (invoice ref, order ref, 
...) was empty. The was no way to go back to a clean situation, even
after vaidating again the object.
 2015-10-06 16:38:27 +02:00
frederic34
9a021e6de4 Optioncss not kept in list 2015-10-04 10:45:57 +02:00
Juanjo Menent
31230d296d Merge remote-tracking branch 'upstream/3.8' into develop 2015-10-03 23:51:38 +02:00
philippe grand
e22fb3c538 fix : Typo 2015-10-02 12:39:09 +02:00
philippe grand
8a9c9f49d5 fix : Typo 2015-10-02 12:37:13 +02:00
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
Raphaël Doursenaud
dabfad1529 [Qual] Replaced deprecated print_titre() 2015-09-24 18:27:13 +02:00
Laurent Destailleur
da6a1d6629 NEW Introduce a method getDefaultCreateValueForField for developers to 
get a default value to use for a form in create mode.
Implement it for public and private notes.
 2015-09-22 13:55:31 +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
Laurent Destailleur
a83b3ae7e8 Merge pull request #3503 from fappels/3.7-dispatch-rounding 
Fix #3471 3.7 Rounding issue when dispatching non-integer
 2015-09-12 11:07:16 +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
Aurélien Stride
1a3d8b5ae4 FIX : adjusted test for affecting supplier reference 2015-08-31 09:25:39 +02:00
Aurélien Stride
e2072999cf ADD : ref_supplier to object property, otherwise not visibly updated on change 2015-08-28 17:12:27 +02:00
philippe grand
53a21019fd the form should be outside table to avoid errors 2015-08-15 16:15:54 +02:00
philippe grand
924ff21268 the form should be outside table to avoid errors 2015-08-15 16:12:33 +02:00
Laurent Destailleur
52240eec9a Fix removed warnings 2015-08-15 02:44:05 +02:00
Laurent Destailleur
fcc6ce8c31 Fix Option for second level approbation was visible when it should 
not.
 2015-07-29 15:39:34 +02:00
Laurent Destailleur
5ca6593a57 Fix serious deadlock feature. It was possible to link with no way to 
unlink. What if user make a bad click ? I complete feature with
reverse action to be sure to not have users with a corrupted situation.
 2015-07-28 14:13:16 +02:00
Laurent Destailleur
72e7558356 Fix bad closing td 
Fix missing value into list of time spent
Fix typo error into constant PROJECT_TIMES_SPENT_FORMAT
Fix sql error when updating time spent into updateTimeSpent
Fix supplier orders not visible into link to
 2015-07-28 12:49:29 +02:00
Laurent Destailleur
1fb40565f4 Fix bad parameters of function select_date 2015-07-12 12:50:24 +02:00
Laurent Destailleur
7ad4d9056d Merge pull request #3117 from All-3kcis/patch-2 
Correct display of hours and minutes after action "Order"
 2015-07-04 04:14:12 +02:00
Laurent Destailleur
5fafb08f91 Uniformize code 2015-07-04 04:11:16 +02:00
Laurent Destailleur
4a1dfa60a5 Uniformize code 2015-06-30 13:14:19 +02:00
All-3kcis
89c870225c Correct display of hours and minutes after action "Order" in supplier order. 2015-06-30 10:49:15 +02:00
Laurent Destailleur
ae5b779652 Uniformize code 2015-06-30 01:34:17 +02:00
Laurent Destailleur
dc050d39eb Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/adherents/type.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/js/lib_batch.js
	htdocs/core/modules/modUser.class.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/card.php
	htdocs/societe/consumption.php
	htdocs/user/info.php
	htdocs/user/note.php
	htdocs/user/param_ihm.php
	htdocs/user/perms.php
 2015-06-29 00:09:28 +02:00
Juanjo Menent
0f046776d5 FIX #3091 TotalHT amount in supplier order is bold unlike the rest of 
Dolibarr
 2015-06-26 17:54:34 +02:00
aspangaro
9d2e964b00 Fix: print_liste_field_titre(''); 2015-06-26 06:23:29 +02:00
Alexis Algoud
21f0fc8229 FIX can receive new batch product on supplier order 2015-06-18 19:49:19 +02:00
Regis Houssin
e3d1614004 Fix: ereg more simple 2015-06-11 09:21:44 +02:00
Laurent Destailleur
9b7982bf0c Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/core/class/html.form.class.php
	htdocs/fourn/facture/card.php
	htdocs/theme/eldy/style.css.php
 2015-06-08 18:28:50 +02:00
Laurent Destailleur
02dbe16366 Mutualize code to show block to link an element to another one. 2015-06-06 15:57:59 +02:00
Regis Houssin
9a812a6c28 Fix: add filter for "dol_most_recent_files" for avoid conflict with 
option "Save file on server with name "FA0700034-Original filename""
 2015-06-06 13:03:02 +02:00
Laurent Destailleur
f42065146a Start to clean html.form class. 2015-06-06 12:26:47 +02:00
Laurent Destailleur
43ed48896a Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/debian/changelog
	htdocs/filefunc.inc.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2015-06-05 18:31:53 +02:00
Laurent Destailleur
1252a500ce Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/fourn/class/fournisseur.product.class.php
 2015-06-05 16:50:46 +02:00
Florian HENRY
fb29fa486a FIX : total amount in tpl linked object are not reset 2015-06-02 11:20:08 +02:00
Laurent Destailleur
4319cd63a3 Working on finishing of look 2015-05-22 14:28:02 +02:00
Laurent Destailleur
03acb1a8c9 Uniformize way to report error after "buildoc" action. 2015-05-19 00:01:30 +02:00
Florian HENRY
4bc2d55cb3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-15 17:37:31 +02:00
Laurent Destailleur
5937cd7f70 NEW Forms are using the tab look, even in creation mode. 2015-05-13 17:53:25 +02:00
Florian HENRY
8e61a03b5c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-12 21:02:36 +02:00
Raphaël Doursenaud
0d8641a073 [Qual] Use jQuery property instead of attribute to test and set checked 2015-05-12 14:51:30 +02:00
Laurent Destailleur
83e4fe5d95 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/fourn/facture/list.php
 2015-05-12 00:09:03 +02:00
Laurent Destailleur
8b596d7a69 Fix css missing 2015-05-10 23:43:18 +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
jfefe
7e0357dcf9 FIX : remove deprecated property 'libelle' on product object 2015-05-04 03:03:24 +02:00
Laurent Destailleur
96a33bbe8a First clean of code after devcamp 2015-04-21 15:49:58 +02:00
Marcos García de La Fuente
7be7a770c1 Implemented units for CommandeFournisseur and FactureFournisseur 2015-04-19 16:46:24 +02:00
Florian HENRY
41631ceed9 typo 2015-04-18 23:43:11 +02:00
Florian HENRY
f2018b7946 fix bug #2652 2015-04-18 22:59:20 +02:00
Florian HENRY
b7191a541c All send email card works with model choice box 2015-04-18 17:15:36 +02:00
Marcos García de La Fuente
d6a2d972a6 Fix: [ bug #2601 ] Supplier orderstoinvoice does not work with PostgreSQL 2015-04-18 15:07:19 +02:00
Marcos García de La Fuente
9fee7a9827 Fix: [ bug #2601 ] Supplier orderstoinvoice does not work with PostgreSQL 2015-04-18 10:30:58 +02:00
Laurent Destailleur
d7ef1e7da0 The supplier code was not visible on supplier pdf. 2015-04-13 14:25:27 +02:00
Laurent Destailleur
5dc1102601 Fix object not defined 2015-04-13 13:34:13 +02:00
Laurent Destailleur
dbaaa44c76 Fix: link must not be visible if module disabled 2015-04-13 13:22:12 +02:00
Laurent Destailleur
56a14da5d4 FIXME that are not bug are replaced with TODO 
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
 2015-04-12 04:01:28 +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
530650b857 Make module productbatch stable 2015-04-10 11:59:41 +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
fc803e7000 Fix permission lost when enabled/disabled module. 2015-04-08 17:33:38 +02:00
Laurent Destailleur
b3355df3bf Fix delivery delay could not be set to unknown 2015-04-08 13:00:03 +02:00
Laurent Destailleur
94087f539f Fix style 2015-04-08 11:50:40 +02:00
Laurent Destailleur
f38bf5a7d2 Fix extrafields were not saved when creating a supplier order 
Fix removed hooks where we must use trigger
 2015-04-03 11:00:52 +02:00
Laurent Destailleur
d71a3c52b4 Comments 2015-04-03 00:28:35 +02:00
Laurent Destailleur
e480177d9c Fix error of triggers not reported to user 2015-04-02 18:44:02 +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
Laurent Destailleur
d8db32a99c NEW: Introduce option SUPPLIER_ORDER_DOUBLE_APPROVAL to allow 2 
approvals to make a supplier order approved. Activating this option
introduce a new permission to the second level approval.
 2015-04-01 21:00:51 +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
2d50cc92b9 Differentiate title for customer and supplier orders/invoices. 2015-03-31 11:32:47 +02:00
Laurent Destailleur
73b2e0bd01 Merge pull request #2471 from marcosgdf/refactor 
refactor
 2015-03-29 16:17:36 +02:00
Laurent Destailleur
6f22243104 Add option SUPPLIER_ORDER_NO_DIRECT_APPROVE 2015-03-23 15:25:21 +01:00
Laurent Destailleur
1a59b7b447 Add option SUPPLIER_ORDER_NO_DIRECT_APPROVE 2015-03-23 15:23:44 +01:00
Laurent Destailleur
3844d4e6f7 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
	htdocs/core/boxes/box_activity.php
	htdocs/fourn/commande/card.php
	htdocs/user/card.php
 2015-03-23 15:16:37 +01:00
Laurent Destailleur
dc0d3504dd Fix: Bad notification key 2015-03-23 14:52:47 +01:00
Laurent Destailleur
b9c3c074b1 Fix: a line was inserted when making update 
Fix: missing message into notification admin page
 2015-03-23 14:43:19 +01:00
Marcos García de La Fuente
4349f27299 Revert "Revert "Refactor 1"" 2015-03-23 01:39:12 +01:00
Laurent Destailleur
2d90256640 Revert "Refactor 1" 2015-03-22 12:51:29 +01:00
Laurent Destailleur
a79a779b04 Merge pull request #2456 from marcosgdf/refactor-1 
Refactor 1
 2015-03-22 12:47:05 +01:00
Laurent Destailleur
a55af4387b Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	.travis.yml
	htdocs/core/class/notify.class.php
	htdocs/product/stock/class/mouvementstock.class.php
	test/phpunit/AllTests.php
	test/phpunit/MouvementStockTest.php
 2015-03-22 12:10:39 +01:00
Laurent Destailleur
d442ac328c Fix: some replacement tags were missing 2015-03-19 12:34:03 +01:00
Laurent Destailleur
6ceda02eaa NEW: Enhancement of module 'Notification by Email'. Show nb of 
notifications set. Can set several emails. Can set a threshold on
amount for notifications. Add notification on supplier order validation.
 2015-03-18 21:44:57 +01:00
Laurent Destailleur
cd2fc2f890 Hooks 'printLeftBlock' and 'formConfirm' are now compliant with hook 
development rules. They are "addreplace" hooks, so you must return
content with"->resprints='mycontent'" and not with "return 'mycontent'"
 2015-03-18 14:31:37 +01:00
Marcos García de La Fuente
086e439543 Merge branch 'develop' into refactor-1 
Conflicts:
	htdocs/core/tpl/objectline_view.tpl.php
 2015-03-15 18:16:55 +01:00
Marcos García de La Fuente
efb9f7f4fd Merge branch 'develop' into refactor-1 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/includes/tcpdi/fpdf_tpl.php
 2015-03-15 18:07:30 +01:00
Laurent Destailleur
548e720ca2 Uniformize code 2015-03-10 19:31:04 +01:00
Laurent Destailleur
51b67704ee Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-10 13:46:44 +01:00
Laurent Destailleur
194260fc5b NEW: Add search box for supplier order search. 2015-03-10 13:25:25 +01: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
dd13e477b1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-03-07 19:07:21 +01:00
Laurent Destailleur
9e4e9a5411 NEW: Can search on customer order amount into customer order list. 2015-03-06 20:59:18 +01:00
Laurent Destailleur
a1567778ab Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fourn/commande/card.php
 2015-03-06 18:51:55 +01:00
Laurent Destailleur
e55a983c03 Fix td balance 2015-03-06 16:13:09 +01:00
Laurent Destailleur
a169b3348e Fix show alays date fields for contract module. 
Fix select of product were lost.
 2015-03-06 14:36:22 +01:00
Laurent Destailleur
7b7b5090c7 Merge branch 'incoterm' of https://github.com/atm-ph/dolibarr into 
atm-ph-incoterm

Conflicts:
	htdocs/comm/propal.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-04 23:03:29 +01:00
Laurent Destailleur
96de912661 NEW: Add module "Supplier commercial proposals" to requests 
quotation/price to suppliers.
Merge branch 'new_ask_price' of https://github.com/atm-ph/dolibarr into
atm-ph-new_ask_price

Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/tpl/document_actions_post_headers.tpl.php
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-04 17:54:43 +01:00
Marcos García de La Fuente
f94f9d1e57 Removed $permtoedit variable 2015-03-04 11:19:45 +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
1cdd77a671 Fix: use bad var 2015-02-28 18:18:41 +01:00
Laurent Destailleur
4d226885cb Rewrite code for supplier order and invoice to use shared code of 
customer supplier and invoice.
Work on extrafield for supplier order and invoice.
 2015-02-28 18:10:31 +01:00
Laurent Destailleur
8e26c71fa7 Rewrite code for supplier order and invoice to use shared code of 
customer supplier and invoice.
Work on extrafield for supplier order and invoice.
 2015-02-28 04:59:27 +01:00
Laurent Destailleur
ef14e4e7ed Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.product.class.php
 2015-02-28 03:11:15 +01:00
Laurent Destailleur
5d1545ad1f Work on supplier order and customer extrafields 
Use templates to show/edit supplier order and invoice lines
 2015-02-27 18:05:12 +01:00
Laurent Destailleur
4bde7e9f51 Fix: Missing error management 2015-02-26 14:25:30 +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
afa8e5c6d8 Merge remote-tracking branch 'origin/3.7' into develop 2015-02-23 19:50:51 +01:00
Laurent Destailleur
4128c86035 Fix: Filter on statut was lost 2015-02-23 19:31:42 +01:00
Laurent Destailleur
6d3834b3b9 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/index.php
	htdocs/projet/class/project.class.php
	test/phpunit/BankAccountTest.php
 2015-02-23 14:59:24 +01:00
phf
127868899d Merge branch 'develop' into incoterm 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-02-23 10:42:01 +01:00
phf
81130634d3 [CORE] intégration de incoterm sur les différentes class (#incoterm). 2015-02-23 09:16:14 +01:00
Laurent Destailleur
b04682db4c Fix Edit of extrafield on supplier invoice or order was deleteing other 
fields.
Fix Missing escapment
Fix new field delivery date was only into edit page
 2015-02-22 17:41:02 +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
Laurent Destailleur
d7dcf28c61 Merge branch '3.7' of https://github.com/atm-gauthier/dolibarr into 
atm-gauthier-3.7

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2015-02-18 23:15:40 +01:00
Laurent Destailleur
b6947dbe2c Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/modules/DolibarrModules.class.php
 2015-02-18 22:04:26 +01:00
Laurent Destailleur
1e1543403b New: Add option SUPPLIER_ORDER_AUTOADD_USER_CONTACT to automatically set 
user approving as contact following supplier order.
 2015-02-17 19:49:17 +01:00
Laurent Destailleur
ad67fe50a3 Correct management when delivery date is universal time format. 2015-02-17 17:21:41 +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
phf
34bc1dbc15 Merge branch 'develop' into new_ask_price 2015-02-09 09:07:50 +01:00
phf
1d9a3e0ce2 [CORE] Fix : renommage d'une fonction (#deliverytime). 2015-02-06 16:39:54 +01:00
phf
35d41d6f7c [CORE] Ajout d'un attribut (delai_livraison_jours) à l'objet ProductFournisseur, paramétrable lors d'un ajout/modification d'un prix fournisseur et s'affiche sur une commande fournisseur avec le plus grand délai parmis la liste des produits dans la commande (#deliverytime). 2015-02-06 16:07:22 +01:00
phf
8ace3ee77b [CORE] FIX : la validation d'une demande de prix à "accéptée" ne créer plus d'entré si le prix ou la quantité est à 0. 
FIX : la création d'une commande depuis une demande ne prend plus en compte les produits qui ont un prix ou quantité à 0. (#new_ask_price).
 2015-02-06 10:17:10 +01:00
Laurent Destailleur
4c5fa7510c Fix bad translation key 2015-02-05 12:06:20 +01:00
phf
b9ac5bc9e0 [CORE] correction bug lors de l'appel d'une fonction addline() et mise en commentaire d'un traitement inutile puisqu'on est uniquement dans le cas du fonctionnement du module (#new_ask_price). 2015-02-03 15:26:14 +01:00
frederic34
6a1865adb6 Merge remote branch 'upstream/develop' into tooltip 
Conflicts:
	htdocs/fourn/commande/list.php
 2015-01-31 09:58:41 +01:00
Laurent Destailleur
d0cc56d616 Showing price without tax also. 2015-01-31 01:12:05 +01:00
Laurent Destailleur
74dafbe034 Fix missing class 2015-01-31 00:45:55 +01:00
Laurent Destailleur
03cc1bd039 Fixed bad sql error 2015-01-31 00:27:35 +01:00
Laurent Destailleur
a35bd9a3e4 Fixed bad sql request 2015-01-31 00:27:11 +01:00
Laurent Destailleur
2684b327e5 Fixed bad sql error 2015-01-31 00:23:10 +01:00
Laurent Destailleur
29d399ba79 Merge remote-tracking branch 'origin/3.7' into develop 2015-01-31 00:09:37 +01:00
Laurent Destailleur
0ea4a5db7d Fixed: Error management on triggers 2015-01-31 00:08:45 +01:00
Laurent Destailleur
275e198041 New: Selection of project use the new select2 component. 2015-01-30 19:57:38 +01:00
phf
d2cd78884e [CORE] ajout de code nécessaire pour le fonctionnement du module pour créer une code fournisseur depuis une demande validé et accépté (#new_ask_price). 2015-01-30 16:52:14 +01:00
frederic34
b850b7b448 Merge remote branch 'upstream/develop' into tooltip 
Conflicts:
	htdocs/langs/en_US/sendings.lang
 2015-01-30 16:45:24 +01:00
frederic34
736bee565c Tooltip everywhere 2015-01-30 16:40:33 +01:00
Laurent Destailleur
59711298c3 Fixed: Length of project label is no more truncated on element cards 
(invoice, proposal, order...)
 2015-01-30 16:33:39 +01:00
Laurent Destailleur
4fdc287717 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/admin/menus.php
	htdocs/fourn/commande/card.php
	htdocs/install/check.php
 2015-01-30 15:53:06 +01:00
phf
3b0fd5ec98 [CORE] modification légère, début de redirection pour créer une commande fournisseur si la demande est accépté (#new_ask_price). 2015-01-29 17:36:12 +01:00
Laurent Destailleur
b61c475aa8 Clean code for validate permissions. "validate" is a status to say, "now 
it exists, it is no more a draft", so by default we don't need this
permissions (it is same than create). We keep "validate" permissions as
an "advanced" permission only.
 2015-01-25 21:32:40 +01:00
Laurent Destailleur
ad68b3ca6c Fixed approve during validation if user has permission 
Fixed error management
Fixed rendering country must be same for all tabs.
 2015-01-25 00:59:46 +01:00
frederic34
76bf95789d Merge remote branch 'upstream/develop' into tooltip 
Conflicts:
	htdocs/fourn/commande/list.php
 2015-01-24 21:51:33 +01:00
frederic34
e18577aa62 Tooltip and lib for file cache 2015-01-24 21:46:05 +01:00
Laurent Destailleur
267ba24820 Generalize option PROJECT_SHOW_REF_INTO_LISTS 2015-01-24 21:41:40 +01:00
jean
b809f0aeb8 Merge remote-tracking branch 'origin/3.6' into 3.6 2015-01-20 17:31:17 +01:00
Laurent Destailleur
e220ce5a82 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/card.php
	htdocs/comm/propal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/custom/.gitignore
	htdocs/expedition/card.php
	htdocs/fourn/card.php
	htdocs/product/fournisseurs.php
 2015-01-18 18:44:22 +01:00
KreizIT
a9008c4993 Fix Creating default object from empty on supplier order confirmation 2015-01-15 17:40:15 +01:00
Cedric
999a6052ff FIX : Creating default object from empty when validating supplier order 2015-01-15 16:23:10 +01:00
Laurent Destailleur
5ead994955 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
 2014-12-26 04:57:55 +01:00
Marcos García de La Fuente
aec1bdb3c4 Fixed [ bug #1766 ] PHP Warning when adding a service to a supplier invoice 2014-12-25 23:08:07 +01:00
Laurent Destailleur
711b033844 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/class/html.form.class.php
	htdocs/product/stock/card.php
 2014-12-14 12:35:13 +01:00
Laurent Destailleur
b681885542 Fixed: Bad url link 2014-12-10 21:14:59 +01:00
Laurent Destailleur
ef4bdcdb2a Merge remote-tracking branch 'origin/3.7' into develop 2014-11-30 15:43:04 +01:00
Laurent Destailleur
e395fd8096 Fix CRLF 2014-11-30 15:24:39 +01:00
Laurent Destailleur
a724c3aa70 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/main.inc.php
 2014-11-28 02:26:40 +01:00
Marcos García de La Fuente
5cc015268e Fixed [ bug #1718 ] Mistakenly searching for text in amount field breaks 2014-11-28 01:02:59 +01:00
Laurent Destailleur
806719b562 Merge pull request #2089 from marcosgdf/bug-1718 
Fixed [ bug #1718 ] Mistakenly searching for text in amount field breaks
 2014-11-28 00:37:56 +01:00
Laurent Destailleur
232921a506 Fixed: Add option on a not common new feature 2014-11-28 00:34:03 +01:00
aspangaro
c4c69e191b Replace <center> tags 2014-11-25 20:13:43 +01:00
Marcos García de La Fuente
082f67a6e4 Fixed [ bug #1718 ] Mistakenly searching for text in amount field breaks 2014-11-24 12:49:33 +01:00
Frédéric FRANCE
afc87f5445 Update /fourn/commande/list.php 2014-11-23 17:45:07 +01:00
Frédéric FRANCE
018d1488fc Update /fourn/commande/list.php 2014-11-23 10:03:03 +01:00
aspangaro
acbbe823e8 Typo 2014-11-06 20:04:51 +01:00
aspangaro
b60f834d8d Improve search into supplier command list 2014-11-06 07:19:16 +01:00
Laurent Destailleur
5086450f35 Fix: Forging email content must use dol_concatdesc. 2014-11-02 12:32:38 +01:00
Ion Agorria
82aa8458bf Added ws url/key to thirdparty SQL table, class and info page 2014-10-31 17:46:11 +01:00
Ion Agorria
557cbaf3d7 Added module descriptor and activation checks 
Corrected 3 missing $error_occurred flags
 2014-10-31 04:59:57 +01:00
Ion Agorria
e875f0c2b8 Fixed missing separator 2014-10-29 05:33:59 +01:00
Ion Agorria
4ff570571e Added SOAP client for creating a client order in remote 
webservice that thirdparty might have.
 2014-10-29 05:13:15 +01:00
Laurent Destailleur
132ddf65d6 Fix: several bugs into document generation (default must be used in 
priority when not template defined).
Fix: use first odt file when no odt file defined.
Fix: Must use output translation.
 2014-10-27 19:37:30 +01:00
jean
619bcb44df object must be reloaded before creating pdf on confirmation and ordering 2014-10-21 19:02:48 +02:00
Maxime Kohlhaas
ee4b807a5d Qual : refactoring extrafields display on objects into a single tpl file 2014-10-14 17:00:06 +02:00
Regis Houssin
a2446e51db New: add context "globalcard" for declaring only once all cards 2014-10-06 07:20:58 +02:00
Laurent Destailleur
11d1be882c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/contrat/list.php
 2014-10-04 17:32:01 +02:00
Laurent Destailleur
97eec37f1c Uniformize code: property "nom" for thirdparty is aliased into "name" 
everywhere.
 2014-10-04 17:20:17 +02:00
Florian HENRY
46f673fb5f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/fourn/card.php
 2014-09-29 16:01:49 +02:00
Laurent Destailleur
ba33f73767 Merge pull request #1925 from tiaris/develop 
adding hooks for supplier card and order card
 2014-09-29 15:40:31 +02:00
Florian HENRY
ce145cc056 Add cache excel export on harddrive with 
MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR const. It can avoid lot's of stack
overflow on large excel export
 2014-09-29 10:16:48 +02:00
Laurent Destailleur
ec95aacd52 Uniformize code for error reporting after a hook. 2014-09-28 03:41:32 +02:00
Laurent Destailleur
722e939e19 Fix: form must not be into a closing and opening tr tag. 2014-09-26 13:23:54 +02:00
Florian HENRY
3bc227b467 Fix for travis syntax 2014-09-25 10:25:15 +02:00
jean
e9374e8c08 adding hook for addMoreActionsbuttons 2014-09-25 09:26:32 +02:00
Laurent Destailleur
396bae21d6 Fix: Missing closing tr 2014-09-24 18:15:20 +02:00
Florian HENRY
518d23f278 Add feature to order to invoice on supplier part 2014-09-23 16:28:29 +02:00
Laurent Destailleur
dc96e10215 Merge branch 'oop-pdf' of github.com:marcosgdf/dolibarr into 
marcosgdf-oop-pdf

Conflicts:
	htdocs/projet/class/project.class.php
 2014-09-23 00:02:19 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
aspangaro
b22aef3521 Qual: Renamed all files & links "liste.php" into "list.php" 2014-09-18 20:33:37 +02:00
Marcos García de La Fuente
9ae7486555 Removed deprecated usage of supplier_order_pdf_create and supplier_invoice_pdf_create 2014-09-16 21:42:07 +02:00
Laurent Destailleur
83447243ae Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	build/debian/get-orig-source.sh
	htdocs/product/class/product.class.php
	htdocs/societe/soc.php
 2014-09-15 22:58:39 +02:00
Laurent Destailleur
05f3a47018 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	build/debian/control
	htdocs/compta/bank/account.php
	htdocs/fourn/paiement/fiche.php
	htdocs/product/class/product.class.php
	htdocs/product/fiche.php
 2014-09-15 22:52:59 +02:00
Marcos García de La Fuente
949ae2f160 [ bug #1591 ] Linked object block shows Total HT/TTC even if not having permission to read them 2014-09-14 13:09:31 +02:00
Cubexed
00856eb277 Merge remote-tracking branch 'upstream/develop' into develop 2014-08-26 17:29:42 +02:00
Laurent Destailleur
bc0c5fb55e New: Can modify order with status approved if it was not sent yet to 
supplier.
 2014-08-21 14:24:06 +02:00
Cubexed
ecd90ddbff Enables the fetching and saving of start and end dates in supplier order lines. 2014-08-18 23:02:04 +02:00
Laurent Léonard
0228cd9db7 Fix translations in e-mail forms 2014-07-28 02:45:58 +02:00
Juanjo Menent
acaca341ab Fix: [ bug #1521 ] The second order's page from a provider shows all 
orders

Conflicts:
	ChangeLog
 2014-07-21 17:00:59 +02:00
Juanjo Menent
8cd2e00e5f Fix: [ bug #1521 ] The second order's page from a provider shows all 
orders
 2014-07-21 16:57:08 +02:00
Laurent Destailleur
dec7fe42af Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/fourn/commande/fiche.php
 2014-07-20 15:37:50 +02:00
Laurent Destailleur
bf926cd791 Merge pull request #1756 from marcosgdf/messages 
Migrated old message notifications to the """new""" system
 2014-07-20 04:57:09 +02:00
Laurent Destailleur
5be7e75fe6 Merge pull request #1752 from marcosgdf/doactions-supplier 
Added missing doActions for supplier order fiche.php
 2014-07-20 04:49:27 +02:00
Laurent Destailleur
8137fd7fe4 Fix: Type of line (product/service) could not be edited on supplier 
order/invoice.
 2014-07-20 02:36:03 +02:00
Marcos García de La Fuente
4f4ac30fc0 Deprecating arbitrary use of dol_htmloutput* functions 2014-07-20 02:32:13 +02:00
Laurent Destailleur
b42a33b203 Fix: For contract, only services available by default. Product appears 
if option is set only.
 2014-07-19 21:14:56 +02:00
Marcos García de La Fuente
63585ea9ca Added missing doActions for supplier order fiche.php 2014-07-18 01:32:54 +02:00
Marcos García de La Fuente
ec661d0c6c Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
KreizIT
5e7c0639b0 Refactor: various trigger 2014-07-11 16:02:27 +02:00
frederic34
387d36e4b0 Ste bank account for supplier order 2014-07-09 18:00:21 +02:00
Juanjo Menent
8e4e08f907 [ task #1063 ] Allow edit localtaxes rate for thirds. Improve visu 2014-07-04 16:48:42 +02:00
Laurent Destailleur
e496823778 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	.travis.yml
	ChangeLog
	htdocs/fourn/commande/fiche.php
	htdocs/install/mysql/migration/3.5.0-3.6.0.sql
	htdocs/product/stock/replenish.php
 2014-07-04 14:14:40 +02:00
Juanjo Menent
c7e20c9a80 [ task #1063 ] Allow edit localtaxes rate for thirds. Works with 
Suppliers
 2014-07-04 10:25:05 +02:00
Juanjo Menent
47cff4d407 Fix: Unable to add lines in supplier orders 2014-07-04 10:04:30 +02:00
Laurent Destailleur
2c493a4fe3 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
 2014-06-28 14:55:04 +02:00
Laurent Destailleur
71ee974ddb Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-06-28 14:53:28 +02:00
Laurent Destailleur
a2f610ffbe Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
 2014-06-26 21:41:45 +02:00
Laurent Destailleur
a79aa1f203 Merge branch 'develop' of github.com:FHenry/dolibarr into FHenry-develop 
Conflicts:
	htdocs/product/class/product.class.php
 2014-06-26 21:38:03 +02:00
Laurent Destailleur
0b38fcb830 Merge pull request #1604 from atm-alexis/develop_add_delivery_column_on_supplier_order 
Develop - add delivery column on supplier order
 2014-06-26 21:13:20 +02:00
Laurent Destailleur
018e1d31e3 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/product/class/product.class.php
	htdocs/projet/class/project.class.php
 2014-06-25 20:22:25 +02:00
Cedric
00779dd8fa FIX #1460, #1461 2014-06-24 10:53:18 +02:00
Laurent Destailleur
b4add020a9 Fix: Question about warehouse must not be done when module stock is 
disabled.
Fix: Option STOCK_SUPPORTS_SERVICES was not correctly implemented
(missing test at some places).
 2014-06-23 11:47:07 +02:00
Laurent Destailleur
8d1fdec8cf Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/fiche.php
	htdocs/projet/fiche.php
 2014-06-20 15:26:02 +02:00
Laurent Destailleur
28fd8c6862 Fix: [ bug #1431 ] Reception and Send supplier order box has a weird top 
margin.
 2014-06-20 14:04:37 +02:00
Florian HENRY
40f5911f52 Fix: [ bug #1254 ] Error when using "Enter" on qty input box of a 
product (on supplier order part)
 2014-06-20 09:36:31 +02:00
Florian HENRY
9bb537f399 - New: If multilangue is enabled, mail (from propal, invoice, etc...) 
message is pre-defaulted in Customer language
 2014-06-18 09:59:15 +02:00
Laurent Destailleur
8d8ca154f1 Fix: For supplier order/invoice, deselect product when free line is 
selected.
 2014-06-09 14:58:58 +02:00
Laurent Destailleur
ccca46f380 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/list.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/functions.lib.php
	htdocs/expedition/note.php
	htdocs/fourn/commande/liste.php
	htdocs/fourn/facture/fiche.php
	htdocs/main.inc.php
	htdocs/projet/tasks/index.php
	htdocs/theme/eldy/style.css.php
 2014-05-29 19:20:48 +02:00
Marcos García de La Fuente
603c28dcdd [ bug #1397 ] Filter by supplier orders with status Draft does not filter 2014-05-23 02:04:02 +02:00
Laurent Destailleur
b7f55ea99c Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/modAgenda.class.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/liste.php
 2014-05-18 11:52:52 +02:00
Alexis Algoud
45067c63d8 Add delivery date into supplier order list 2014-05-15 11:37:40 +02:00
Laurent Destailleur
b3b7da8f08 Merge pull request #1595 from FHenry/develop 
Add showempty into combobox
 2014-05-14 11:46:35 +02:00
Laurent Destailleur
4a347236ee Merge pull request #1594 from atm-alexis/develop 
Add detailled view in supplier order as in customer order
 2014-05-14 11:40:49 +02:00
Florian HENRY
eb8eca5f9d Suplier Order, do not insert line if error with missing fields 2014-05-14 10:55:27 +02:00
Laurent Destailleur
7ecfd4c243 Fix: seller and buyer inverted when using suppliers orders and 
invoices.
 2014-05-13 13:55:08 +02:00
Alexis Algoud
197ff1a653 Add detailled view in supplier order as in customer order 2014-05-12 12:10:53 +02:00
Alexis Algoud
f13c146908 Fix page numerotation as in company list 2014-05-12 11:00:58 +02:00
Laurent Destailleur
131f133e07 New: Merge free product and predefined product area to enter new 
product (Supplier orders now use same template than customer
orders/proposal/invoices).
 2014-05-05 17:59:43 +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
19d71ffb38 Prepare fix to hide images generated by "preview" feature. 2014-04-29 21:14:55 +02:00
Raphaël Doursenaud
6d7728d9bf Regenerate document on supplier orders steps 2014-04-02 15:37:19 +02:00
Laurent Destailleur
9a8a306d78 Qual: Method form->select_currency() has been removed. Use instead 
print form->selectCurrency().
Qual: Method form->select_methodes_commande() has been renamed into
english name selectInputMethod().
 2014-04-02 14:53:42 +02:00
Laurent Destailleur
3a2caa6e64 New: Can filter on status for supplier order. 2014-04-02 12:48:34 +02:00
Laurent Destailleur
b675b9b610 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/action/fiche.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/fourn/facture/fiche.php
	htdocs/langs/en_US/admin.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/projet/tasks/task.php
 2014-03-31 00:44:45 +02:00
Alexis Algoud
f97c8feb54 fix can't add line with product in supplier order 2014-03-26 11:28:41 +01:00
Florian Henry
cf9b194008 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-03-21 15:08:30 +01:00
Florian Henry
f0882eca2d Add ref supplier as column and clear varialbes in double 2014-03-21 15:01:40 +01:00
Laurent Destailleur
f9c1b590d0 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/facture.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/filefunc.inc.php
 2014-03-19 22:29:18 +01:00
Gauthier
eb43bc4982 Correction when adding line with price as '0' 2014-03-17 15:38:12 +01: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
24b0ea6613 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/comm/propal.php
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-03-03 19:38:02 +01:00
Laurent Destailleur
ea773531b5 Fix: [ bug #1206 ] PMP price is bad calculated 2014-03-01 14:49:30 +01:00
Laurent Destailleur
b64a2b2718 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/action/fiche.php
 2014-02-28 21:43:29 +01:00
Laurent Destailleur
74404749c6 Fix: [ bug #1254 ] Error when using "Enter" on qty input box of a 2014-02-28 16:00:57 +01:00
Laurent Destailleur
6f962397e4 Start to work on a mass send remind feature. 2014-02-19 20:23:02 +01:00
geoffrey.girard
efa7a16c07 Add hook printObjectLine supplier order and supplier invoice 2014-02-04 17:30:48 +01:00
Laurent Destailleur
1fd67807ce Merge remote-tracking branch 'origin/3.5' into develop 2014-01-18 01:13:29 +01:00
Grand Philippe
462f65614d Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1 2014-01-13 10:10:17 +01:00
Laurent Destailleur
23eb0f3770 Qual: Mutualize code for actions of editing notes 
New: Add button 'cancel' to cancel edition of a note (private or public)
 2014-01-11 13:33:30 +01:00
Laurent Destailleur
9e5e74cb58 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/fourn/commande/fiche.php
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/languages.lang
	htdocs/langs/es_ES/main.lang
 2013-12-19 21:03:15 +01:00
Geoffrey
1942b4a476 add extrafields support in supplier orders. managed in configuration but not in view mode 2013-12-17 16:15:48 +01:00
Geoffrey
dce354adc3 add extrafields support in supplier orders. managed in configuration but not in view mode 2013-12-16 11:13:39 +01:00
Laurent Destailleur
a05d9b864a Fix: Test must never be done on a translated string 2013-12-08 16:40:45 +01:00
Laurent Destailleur
37b0780523 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/ecm/tpl/builddatabase.tpl.php
	htdocs/fourn/commande/liste.php
	htdocs/product/admin/product_tools.php
 2013-12-08 00:42:36 +01:00
Laurent Destailleur
395066519b Fix: [ bug #1163 ] SQL Error when searching for supplier orders 2013-12-01 16:18:18 +01:00
Laurent Destailleur
bdf8100d84 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/core/lib/agenda.lib.php
	htdocs/product/stats/commande_fournisseur.php
 2013-11-28 15:54:12 +01:00
Laurent Destailleur
0e743d5024 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/adherents/admin/adherent.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/document.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/facture/list.php
	htdocs/cron/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/commande/document.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cron.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/nl_NL/categories.lang
	htdocs/langs/nl_NL/commercial.lang
	htdocs/langs/nl_NL/companies.lang
	htdocs/langs/nl_NL/dict.lang
	htdocs/langs/nl_NL/main.lang
	htdocs/langs/nl_NL/margins.lang
	htdocs/langs/nl_NL/products.lang
	htdocs/societe/class/societe.class.php
	htdocs/societe/rib.php
 2013-11-19 21:08:02 +01:00
Laurent Destailleur
48570f599a Fix: form is not allowed into a table. This break some javascript and 
make some browsers crazy.
 2013-11-17 23:25:25 +01:00
simnandez
b9c8852471 Qual: Improve suppliers orders manual receivings 2013-11-14 17:08:59 +01:00
Cédric Salvador
00c9df670c renamed templates 2013-11-06 10:22:01 +01:00
Cédric Salvador
6c22af00e1 factorization 2013-11-06 10:20:54 +01:00
Cédric Salvador
23008c3b31 factorized document actions 
Conflicts:
	htdocs/societe/document.php
 2013-11-06 10:11:40 +01:00
Grand Philippe
a14de0c035 fix : language 2013-11-05 15:29:33 +01:00
Grand Philippe
c5f29e14a4 missing trad and fix language 2013-11-02 17:50:24 +01:00
Cédric Salvador
fc136d0d06 changed parameter 2013-09-16 14:17:53 +02:00
Cédric Salvador
d9a26d0aa9 natural search in list pages 2013-09-16 14:17:53 +02:00
Laurent Destailleur
305c1d63a7 Qual: Uniformize code. No useless redirect. use GETPOST. 2013-09-06 13:25:45 +02:00
Laurent Destailleur
c151ef7b87 Qual: Remove duplicate form instanciation. 2013-09-06 12:10:09 +02:00
Raphaël Doursenaud
e762042828 Fixed typos 2013-09-05 18:06:51 +02:00
Florian Henry
3cf3dbeb51 Add pdf link into supplier invoice list and supplier order list 2013-08-09 13:48:44 +02:00
Laurent Destailleur
afae841ae4 Fix: Permissions on files 2013-08-06 00:36:21 +02:00
Laurent Destailleur
c41a955cbe Fix: Permissions on files 2013-08-06 00:36:04 +02:00
Maxime Kohlhaas
5a38a43c87 Task # 1011 : now supplier order and invoice deal with payment terms and mode 2013-07-30 16:21:39 +02:00
Laurent Destailleur
67820774bb Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/commande/fiche.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
 2013-07-27 14:21:47 +02:00
Florian Henry
e82b8e9b9e Fix [ bug #990 ] Filter + sort does not work on order list 2013-07-26 12:16:39 +02:00
Laurent Destailleur
bf9b255c92 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_opensuse.spec
 2013-07-24 15:25:00 +02:00
Laurent Destailleur
d802470aae I killed <td nowrap>. Hello <td class="nowrap"> ! 2013-07-19 14:23:42 +02:00
Laurent Destailleur
b5820315f9 Fix: Correct permissions on files 2013-07-13 10:34:19 +02:00
Laurent Destailleur
548ea4f93f Fix: Navigation 2013-07-10 23:58:49 +02:00
Laurent Destailleur
c98545010b Fix: Navigation 2013-07-10 23:57:18 +02:00
Grand Philippe
b599481ef6 standardize code 2013-06-20 09:18:12 +02:00
Laurent Destailleur
c748f3d834 Qual: Removed useless methods 
Qual: Removed deprecated vars
Qual: Free memory
 2013-06-16 21:31:21 +02:00
Marcos García
3b28de0a07 Fixed some translation problems 2013-06-08 21:57:57 +02:00
Cédric Salvador
37ef86379f fixed bug when editing a supplier order line 2013-06-05 18:19:50 +02:00
Laurent Destailleur
36b314a2d6 Try to solve some problems with table (replaced by div). 2013-04-25 20:27:45 +02:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
Marcos García
5b248805c2 Notifications popup messages were not showing real notifications that were going to be sent 2013-04-21 14:24:19 +02:00
Raphaël Doursenaud
e1a3d46ea0 Fixed for new API for note update 2013-04-20 06:43:13 +02:00
Laurent Destailleur
d3f29649d5 Fix into div/br 2013-04-16 01:23:33 +02:00
Laurent Destailleur
10ab1a583a Look: Optimize screens 2013-04-16 01:13:20 +02:00
Laurent Destailleur
ae01285fe9 Look: Replace table with div. 
Look: Optimize for smartphone
 2013-04-12 16:16:39 +02:00
Laurent Destailleur
b496436fe3 Qual: Reduce number of methods. Mutualize update_note code. 2013-04-10 10:58:38 +02:00
fhenry
275bf67bb7 [ task #811 ] Uniformanize note field 2013-04-09 17:18:07 +02:00
Laurent Destailleur
e0baa0fe46 Generalize fix: file with a specific mask not found, again 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/expedition/fiche.php
	htdocs/fichinter/fiche.php
 2013-03-30 14:04:09 +01:00
Laurent Destailleur
a5e66ab7ba Generalize fix: file with a specific mask not found, again 2013-03-30 13:54:46 +01: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
fhenry
8971e6fe15 [ task #710 ] Envoi de mail 2013-03-23 14:39:23 +01:00
simnandez
8114249fca [ task #652 ] Reduce clicks into creaton of orders, invoices, etc. 
Supplier order
 2013-03-12 15:06:38 +01:00
Laurent Destailleur
746e005726 Fix: Fix ton of regression due to field name change 2013-03-09 20:34:38 +01:00
Laurent Destailleur
51d23d7c48 Merge fix of 3.3 2013-03-02 16:17:12 +01:00
Laurent Destailleur
81a06507fa Fix: data not refreshed 2013-03-02 16:01:46 +01:00
Maxime Kohlhaas
cd5bda27f4 Supplier dispatch : add new trigger called after order is dispatched 2013-02-25 16:56:37 +01:00
Grand Philippe
6adc9eb7f2 english language standardization 2013-02-23 17:40:28 +01:00
Laurent Destailleur
3eb485d521 Qual: Removed TODO, deprecated code and deprecated properties. This also 
fix missing combo box of contacts onto CC.
 2013-02-12 17:08:21 +01:00
Regis Houssin
fcee35c65d Fix: $hookmanager is a global object 2013-01-26 10:35:30 +01:00
Laurent Destailleur
56e11e52fa New: hookmanager class is used frequently and is a factory object, so we 
can move it during init of environment and use it globally.
 2013-01-25 19:12:54 +01:00
Regis Houssin
9868880142 Fix: missing files library 2013-01-23 11:29:58 +01:00
Regis Houssin
c66c02e745 Fix: missing files library 2013-01-23 11:28:11 +01:00
Laurent Destailleur
d11cee399a Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
 2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence 
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
 2013-01-16 15:36:08 +01:00
Laurent Destailleur
142f171e50 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/.gitignore
 2013-01-08 11:10:47 +01:00
Laurent Destailleur
091e469050 Fix: [ bug #622 ] attaching wrong file when sending the invoice via 
e-mail
 2013-01-07 00:40:18 +01:00
Laurent Destailleur
5f99488c99 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/langs/es_ES/admin.lang
 2013-01-05 16:41:08 +01:00
simnandez
c639d80372 Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country 
is Spain
 2013-01-05 09:47:54 +01:00
simnandez
32b19802b1 Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country 
is Spain
 2013-01-05 09:43:40 +01:00
Laurent Destailleur
4fe1ba33f9 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	COPYRIGHT
 2012-12-30 18:00:07 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Regis Houssin
5740c7e694 Fix: change for a neutral email 2012-12-30 15:11:07 +01:00
Marcos García
0c113d33a6 Removed unuseful code 
Some lines may be marked as changed but they are not because of incorrect line endings
 2012-12-29 13:12:45 +01:00
Laurent Destailleur
4136c27516 RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50 
commits !
 2012-12-01 15:45:05 +01:00
Laurent Destailleur
4abae05c26 Qual: Uniformize behaviour of product selection 2012-11-26 13:37:40 +01:00
Laurent Destailleur
80c252dd62 Fix: Use same labels to go back to draft than other elements. 
Re-open is for "closed" to a validated status.
Modify is for a validated status to draft.
 2012-11-03 21:33:55 +01:00
Regis Houssin
d0dc336a85 New: jQuery and jQuery UI upgrade 
New: jQuery Timepicker addon for Datepicker
 2012-11-03 19:15:45 +01:00
Regis Houssin
9d95e8bffb Fix: missing hookmanager 2012-10-25 11:44:04 +02:00
Regis Houssin
446a81b4c4 Fix: move class in template 2012-10-18 10:35:55 +02:00
Laurent Destailleur
8ff506b120 Sec: Sanitize all params page, sortfield and sortorder 2012-10-13 14:47:46 +02:00
Maxime Kohlhaas
ed2a140046 Task # 559 : add display of discount in product list while adding line on supplier order 2012-10-01 11:45:28 +02:00
Regis Houssin
43c0a03758 Fix: strict mode tornado 2012-09-15 11:21:22 +02:00
Regis Houssin
e19f8c54f1 Fix: strict mode hurricane 2012-09-15 10:01:35 +02:00
Regis Houssin
be13602c71 Fix: use getDocumentsLink method 2012-09-15 09:02:20 +02:00
Laurent Destailleur
2c2d17b101 Fix: Try a fix to avoid having the hover on array that should not have 
it.
 2012-09-09 13:13:24 +02:00
Marcos García
4209898d20 Lower-cased Header function 2012-08-31 05:58:38 +02:00
Regis Houssin
6fe631378b Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into task498_objectline 2012-08-25 11:28:08 +02:00
Regis Houssin
c9113458d9 New: [ task #498 ] part 3 2012-08-25 03:28:30 +02:00
Marcos García
082753d115 Refactored code 2012-08-24 19:55:31 +02:00
Marcos García
977571e032 Forgot to apply the patch to the rest of the files 2012-08-24 18:32:19 +02:00
Marcos García
0ecfe0465e Fixed bug #499 
The input method of supplier orders wasn't being translated
 2012-08-23 09:20:30 +02:00
Marcos García
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +02:00
Marcos García
ea119c45a2 Lower-cased all <?PHP 2012-08-22 23:27:53 +02:00
Marcos García
f3674317ec Removed parenthesis from all require and replaced with single quotes 2012-08-22 23:24:21 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Regis Houssin
577a853b9b New: update field "qty" with minimum qty for this supplier price 2012-08-17 18:17:15 +02:00
Regis Houssin
7394525388 Fix: disable "add" button and show error message if a product with no 
supplier price is selected
 2012-08-17 16:58:57 +02:00
Regis Houssin
3438305169 FIXME: with ajax autocompleter, does not see the products that have no 
supplier prices because they can be selected and it creates an error
message.
Fix: Do not make a "print" on "hook methods", just get the result
 2012-08-17 15:16:07 +02:00
Regis Houssin
4825448ced Merge pull request #315 from marcosgdf/error-messages 
Forgot to migrate to some lines to the new error-handler
 2012-08-16 13:59:05 -07:00
Marcos García
29f2e7236a Forgot to migrate to some lines to the new error-handler 2012-08-16 21:37:33 +02:00
Regis Houssin
7a30416124 Merge pull request #310 from marcosgdf/error-messages 
Added missing error messages in supplier & customer's orders
 2012-08-16 08:16:56 -07:00
Marcos García
db5d046ee7 Applied 3.3 error management as @hregis requested 2012-08-16 13:10:14 +02:00
Marcos García
3941466cd3 Removed duplicated code 2012-08-16 03:55:41 +02:00
Marcos García
b4471a4bd7 Added missing error messages in supplier & customer's orders 2012-08-15 15:52:51 +02:00
Stephen L
c1d15a9572 Add: hooks and triggers for a lot of core modules (action/calendrier, deplacement, dons, tva, contact/tiers, contrat, product lines, expedition, fournisseur commandes et factures, fiche intervention, projet et taches) 
Signed-off-by: Stephen L. <lrq3000@gmail.com>
 2012-08-14 15:50:45 +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
28851b46c4 Fix: remove duplicate code 2012-07-29 16:44:19 +02:00
Regis Houssin
a64723ea74 Fix: replace with new event message system 2012-07-29 16:11:52 +02:00
Regis Houssin
0aa6694c95 Fix: broken event message 2012-07-29 15:47:24 +02:00
Regis Houssin
eee5653c54 Fix: try to use the new message system 2012-07-29 12:54:19 +02:00
Regis Houssin
9cdba5bb61 Fix: try another method more clean and can be deployed on any type of 
message
 2012-07-29 08:26:33 +02:00
Regis Houssin
75588c2eb3 Merge pull request #272 from marcosgdf/backtolist-links 
Created BackToList links
 2012-07-28 13:15:42 -07:00
Regis Houssin
c7bacecf10 Fix: try to use another method for messages 2012-07-28 22:07:27 +02:00
Marcos García
90963ca84a BackToList links in Client orders section 2012-07-28 20:54:07 +02:00
Marcos García
472397d5c2 BackToList links in Supplier order section 2012-07-28 20:47:12 +02:00
Marcos García
a6c8838b8f Applied patches 9-15 2012-07-27 21:27:03 +02:00
Regis Houssin
d5ff308992 Fix: declare $mesg and $mesgs in main.inc.php 
Fix: strict mode be back
 2012-07-23 20:52:55 +02:00
Regis Houssin
77b9718473 Fix: strict mode street 2012-07-13 10:15:47 +02:00
Regis Houssin
e1b0d183e4 Fix: add commonorder and commoninvoice classes 2012-07-11 18:13:41 +02:00
Regis Houssin
6f1651309e Fix: global converting lines delimiter 2012-07-02 19:30:37 +02:00
Regis Houssin
bf379fc242 Fix: uniformize code 2012-06-11 21:45:59 +02:00
Regis Houssin
274734b828 Fix: stock message in session and reload the page for avoid url problem 
with jQuery fileupload
 2012-05-31 21:11:26 +02:00
Laurent Destailleur
c2db3265ec Fix: Regression with quot management. Try a better fix. 2012-05-30 12:43:23 +02:00
Regis Houssin
a5b0de15ac Fix: can't delete a files with quote 2012-05-30 08:30:25 +02:00
Laurent Destailleur
3fc3292142 Fix: delete of documents is done by page of element, not by the view 
wrapper.
 2012-05-29 23:50:13 +02:00
Regis Houssin
516be43404 Fix: jquery fileupload broken feature 2012-05-25 20:56:05 +02:00
Regis Houssin
9cf2ea492c Fix: broken features with external module 2012-05-21 18:44:09 +02:00
juanjo
a6b0242f8a [ task #407 ] Manage PDF hidden items 2012-05-21 17:12:57 +02:00
simnandez
d226534ba0 Fix:[ bug #399 ] Bad calculation of local taxes in update line products 2012-05-09 12:12:14 +02:00
Laurent Destailleur
161846be77 Fix: [ bug #397 ] Product VAT is not coming from buying price 2012-05-08 22:10:07 +02:00
Laurent Destailleur
66531ea539 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	htdocs/fourn/commande/index.php
 2012-04-16 12:03:33 +02:00
Regis Houssin
6c3e88e43a Fix: missing field change name 2012-04-16 11:52:27 +02:00
Laurent Destailleur
48542b8625 Fix: Must use tms date 2012-04-16 11:39:26 +02:00
Grand Philippe
980fa86857 uniformise code and fix rights 2012-04-13 14:02:53 +02:00
Grand Philippe
c8dd3b4801 to add delivery date 2012-04-10 17:21:28 +02:00
Laurent Destailleur
4e65d12a0f Fix: The draft view must be at same place for all pages. We will have to 
discuss to move all or not later.
 2012-04-04 17:43:32 +02:00
Vinicius Nogueira
4110f250a7 New: Box Status and Box Drafts changed position 
Show all Status and give the possibility to filter only one, and Drafts
position of the box changed to a better visualization
 2012-04-03 17:26:40 +08:00
Laurent Destailleur
daf2a19396 New: Add signature at end of predefined email text 2012-03-28 00:56:12 +02:00
Laurent Destailleur
78ae7dc075 Checkstyle 2012-03-27 09:59:28 +02:00
Regis Houssin
ffc6812241 Fix: avoid php strict mode warning 2012-03-23 18:19:50 +01:00
Laurent Destailleur
0fd372e5da Trans: Update language files 
New: Prepare code to allow any module to change/add content of
predefined mail and signature.
 2012-03-22 23:52:02 +01:00
Regis Houssin
808c4b5732 New: testing a new method to avoid reloading the page 2012-03-18 14:06:55 +01:00
Regis Houssin
d752e25946 New: add new notes system in contract and order/invoice supplier module 2012-03-18 11:13:01 +01:00
Laurent Destailleur
a7a55645d8 Fix: Some fix when using fckeditor with notes. 
Qual: Uniformize code to use new system for notes.
Qual: Removed duplicate updatenote method into commandefournisseur
class.
 2012-03-18 00:59:24 +01:00
Laurent Destailleur
245edb8596 Fix: Maxi debug on sending document by email. Works now with odt too. 2012-03-16 00:34:41 +01:00
Regis Houssin
8dc8297afe Fix: missing tva rates of supplier 2012-03-15 09:19:38 +01:00
Regis Houssin
f8bf7ade83 Fix: move method in common class 2012-03-13 20:01:10 +01:00
Regis Houssin
150f3ecfe3 Fix: move method in common class 2012-03-13 19:24:11 +01:00
Laurent Destailleur
b5fc41fadc Fix: Removed a lot of checkstyle warnings 2012-03-11 22:08:46 +01:00
FHenry
7b5c9de555 . 2012-03-08 05:15:15 +08:00
FHenry
aba929ed69 hook parameters on select product 2012-03-08 05:15:01 +08:00
Regis Houssin
9301def08d Fix: rename method 2012-03-02 15:03:14 +01:00
Regis Houssin
addc8db9e7 Fix: rename hooks 2012-03-01 16:51:59 +01:00
FHenry
16408b6310 Merge remote branch 'origin/develop' into develop 2012-02-29 14:32:33 +01:00
FHenry
59f424bde3 add hook for select produit 2012-02-29 14:32:22 +01:00
Laurent Destailleur
1645ddbe47 Sec: Sanitize all input for ids. 2012-02-27 22:26:22 +01:00
Laurent Destailleur
24422afe44 Better fix 2012-02-26 02:54:16 +01:00
Laurent Destailleur
de187ab398 Try a better fix 2012-02-25 16:14:41 +01:00
Regis Houssin
19f53e6caa Fix: default customer language problem 2012-02-25 11:10:38 +01:00
Laurent Destailleur
c4b845d60a Qual: Removed deprecated function name. 2012-02-19 18:34:22 +01:00
Regis Houssin
cd3452d71d Fix: multicompany sharings and uniformize code 2012-02-11 10:18:09 +01:00
Laurent Destailleur
be4d04ebcc Fix: Default language set to language of thirdparty 2012-02-01 21:04:49 +01:00
Regis Houssin
c6e4206907 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-02-01 11:33:11 +01:00
Regis Houssin
4431510ce4 Fix: use entity field of object 2012-02-01 11:32:55 +01:00
Laurent Destailleur
f3a966a313 Fix: Missing name 2012-01-29 23:24:47 +01:00
Laurent Destailleur
08e33f20dc Qual: Uniformize code 
Doxygen
 2012-01-19 09:53:27 +01:00
Regis Houssin
4eb88be3b6 Fix: bad rights 2012-01-09 11:28:37 +01:00
Regis Houssin
85d7285519 [bug #275] Ajout contacts - choix par "par défaut" de l'entreprise du 
fournisseur
Fix: uniform code
 2012-01-09 11:12:07 +01:00
Laurent Destailleur
c2348ef600 Uniformize field country_id, country_code, country 2011-12-29 18:07:41 +01:00
Laurent Destailleur
43964552bf Add a TODO 2011-12-22 09:07:02 +01:00
Laurent Destailleur
95a292f41b Fix: Update licence files 2011-12-17 21:58:44 +01:00
Laurent Destailleur
11727d68b8 Fix: update was not included into pdf generation 2011-12-02 19:57:20 +01:00
Laurent Destailleur
1c65768286 Fix: flot graph works with new json_encode 2011-12-01 22:58:32 +01:00
Laurent Destailleur
839781dfbe Qual: Removed a TODO by renaming all ->monnaie into ->currency 2011-11-23 14:55:36 +01:00
Laurent Destailleur
c50f3c5851 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-11-22 09:41:46 +01:00
Regis Houssin
065d7996f5 Fix: better with json_encode 2011-11-20 15:25:08 +01:00
Laurent Destailleur
c0774485f9 Qual: Uniformize code 2011-11-20 12:55:28 +01:00
Juanjo Menent
d7fce41b8a Fix: [bug 235] Bad local tax control 
Conflicts:
	htdocs/fourn/commande/fiche.php
 2011-11-20 10:17:14 +01:00
Laurent Destailleur
10961fb2c9 New: Can choose warehouse for stock change on supplier approbation or 
supplier invoice validation
 2011-11-09 22:10:58 +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
Laurent Destailleur
40da2e23d2 Qual: Reduce sub-options of module fckeditor. This make code cleaner 
and all this duplicated options were useless.
 2011-11-05 23:18:49 +01:00
Juanjo Menent
5c9ba8a548 [task 189] Move Error* key from other.lang into errors.lang files 2011-10-29 23:52:05 +02: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
c65238b773 [task #216] Move lib in core directory 2011-10-24 10:45:06 +02:00
Regis Houssin
30c5f4b214 Move all core class in htdocs/core/class 2011-10-24 09:29:17 +02:00
Laurent Destailleur
15db353eb4 New: Add option MAIN_DISABLE_PDF_AUTOUPDATE 2011-10-14 16:44:22 +02:00
Laurent Destailleur
9e09b16219 Qual: Uniformize code 2011-09-24 23:42:31 +00:00
Laurent Destailleur
8aa6382206 Add hidden option PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS 2011-09-24 21:55:18 +00:00
Regis Houssin
6c4acefd93 Fix: Space before opening parenthesis of function call prohibited 2011-09-20 12:56:06 +00:00
Regis Houssin
b6a2f13673 Fix: avoid jenkins warning 
Fix: SpaceAfterOpenBracket, SpaceAfterCloseBracket, SpaceBeforeCloseBracket, SpaceBeforeOpenBracket
 2011-09-20 09:40:27 +00:00
Regis Houssin
2c1b3722f2 Fix: replace sizeof() by count() 2011-09-17 19:49:50 +00:00
Laurent Destailleur
b75d19c264 Qual: Uniformize constructors 2011-09-11 18:35:38 +00:00
Laurent Destailleur
2bb5e4ba69 Fix: W3C 2011-08-31 15:12:09 +00:00
Regis Houssin
03711cf6f2 Fix: remove obsolete tags 2011-08-27 19:15:14 +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
Regis Houssin
5085638f5e Fix: uniformize code 2011-08-23 18:40:45 +00:00
Laurent Destailleur
cfe34139cf Qual: Clean and uniformize code. 
Remove properties, that are not related to business, from parent business class commonobject.
 2011-08-22 22:04:21 +00:00
Laurent Destailleur
fe27643152 New: task #11243: Add best supplier price 2011-08-20 23:56:03 +00:00
Laurent Destailleur
e9b113ade8 Qual: Mutualize some code 
Fix: Missing begin
Fix: Removed functions returning database cursor
 2011-08-14 03:13:50 +00:00
Laurent Destailleur
3f2e6bbf82 Qual: Removed dead code 2011-08-14 02:11:15 +00:00
Laurent Destailleur
27ede66991 Fix: Use correct style for left tables 2011-08-08 15:28:00 +00:00
Laurent Destailleur
d246b87c1a Fix: removed print of function making print. 
Fix: default vat rate must be -1 to be automatic instead of deprecated conf->defaulttx
 2011-08-04 21:46:50 +00:00
Laurent Destailleur
be771c9d44 Fix: Avoid errors into rpm packages 2011-07-31 23:45:11 +00:00
Laurent Destailleur
f40efea008 Fix: file add and delte in email forms was broken with firefox 5 2011-07-10 20:03:38 +00:00
Laurent Destailleur
b76f055d2b Fix: Select of recipient on email form 2011-07-07 21:32:18 +00:00
Laurent Destailleur
e2b18d565a Fix: Bad order on documents pages 2011-07-06 20:56:48 +00:00
Laurent Destailleur
3b3f937e47 Fix: EMail sent message 2011-07-02 16:48:31 +00:00
Laurent Destailleur
7f852d293c Fix: Avoid wrap with chrome. 
Fix: Disable lightbox. Does not works with showphoto.
 2011-06-12 22:13:05 +00:00
Laurent Destailleur
8fe14361c3 Qual: Shorter legend 2011-06-07 00:08:06 +00:00
Laurent Destailleur
a3755324c0 New: Graph js librairie can accept percents with pie. 2011-06-06 22:23:24 +00:00
Regis Houssin
5f6ac1374c New: best method for linked object with actioncomm 
New: add action "shipping send by mail"
 2011-06-04 13:12:44 +00:00
Laurent Destailleur
edd91b7d26 Qual: Clean stock increase/decrease code 2011-05-23 23:46:39 +00:00
Laurent Destailleur
c6df144818 New: Add more graph and fix some statistics. 2011-05-22 00:42:37 +00:00
Laurent Destailleur
5a6221629e New: Add graph for orders. 2011-05-21 22:58:09 +00:00
Philippe Grand
1876606634 to use : hidedetails, hidedesc, hideref within supplier order 2011-05-19 14:58:26 +00:00
Regis Houssin
970a488f7c Fix: uniformize code 2011-05-09 09:44:06 +00:00
Regis Houssin
7416eeea9b Fix: problem with create 2011-05-09 07:42:16 +00:00
Regis Houssin
a052684a3a Fix: linked object block : mutualize code, more simple 
Fix: bad link
 2011-05-09 07:15:17 +00:00
Regis Houssin
67fe35e67b Fix: mutualize code, more simple 2011-05-06 18:27:18 +00:00
Philippe Grand
992fefebfb fix : Mode of payment within supplier order 2011-05-06 07:44:46 +00:00
Philippe Grand
6794eb3bbf prepair Mode of payment within supplier order 2011-05-05 21:35:07 +00:00
Philippe Grand
465a9b58e4 fix double paste 2011-05-05 10:26:51 +00:00
Philippe Grand
56feb1c32f include payment term within supplier order 2011-05-04 21:20:51 +00:00
Regis Houssin
827eed5d39 Fix: delete deprecated code 
Fix: change select_contact for view exclude contcat in grey mode
 2011-04-26 13:49:41 +00:00
Laurent Destailleur
e9f4879245 Qual: Prepare move of function dol_delete_file into file.lib.php 2011-03-09 15:34:57 +00:00
Laurent Destailleur
f2fe06a2b0 Fix: Link betwen supplier order and invoice 2011-03-08 00:15:32 +00:00
Laurent Destailleur
bee3592e59 Fix: Missing br 2011-03-08 00:03:03 +00:00
Laurent Destailleur
9ff348dfb5 Work on SMS features 2011-03-05 16:27:26 +00:00
Regis Houssin
aba9bb9acd Fix: compatibility with pgsql, replace all addslashes by $db->escape in other files 2011-02-24 18:22:24 +00:00
Laurent Destailleur
46808e5700 Reduce a step into supplier order workflow to save time (if user has permission to approve, order is approved when order is validated). 2011-02-23 14:44:29 +00:00
Laurent Destailleur
d8b0d279d8 Fix: Missing JUMP_TAG 2011-02-23 14:23:24 +00:00
Laurent Destailleur
638cb105df Fix: HTML tags must be escaped 2011-02-18 10:45:38 +00:00
Laurent Destailleur
7e1e28f0d8 Fix: Wrong order of name/firstname 2011-02-09 18:27:56 +00:00
Juanjo Menent
a97641eb1e Local Taxes: add funcionality for suppliers 2011-02-09 15:57:37 +00:00
Juanjo Menent
cd7f6ff6eb Local Taxes: add funcionality for suppliers 2011-02-09 13:07:34 +00:00
Juanjo Menent
e3317a7128 Local Taxes: add funcionality for suppliers 2011-02-08 22:45:30 +00:00
Regis Houssin
5da92bf9ae Fix: missing class 2011-02-08 11:00:59 +00:00
Regis Houssin
09f6fab2cc New: add width parameter in editor 2011-02-02 16:56:55 +00:00
Laurent Destailleur
11da59feea Fix: A parameter for urls must not contains any " 2011-01-14 02:02:57 +00:00
Laurent Destailleur
5bde360164 Fix: Sanitize filename 2011-01-14 01:24:00 +00:00
Laurent Destailleur
c8013ac699 Fix: Can't enable document for supplier invoice/order 2010-12-30 22:38:09 +00:00
Regis Houssin
e752ef828a Fix: uniformize code 2010-12-15 08:48:53 +00:00
Laurent Destailleur
2498426867 Fix: Restore stable version for 3.0 2010-12-14 23:27:17 +00:00
Regis Houssin
9d46536909 Fix: uniformize code 2010-12-14 15:04:56 +00:00
Laurent Destailleur
86ffc32195 Qual: Uniformize a lot of code (supplier_invoice => invoice_supplier, same for order) 
New: Add link between supplier invoices and supplier orders.
 2010-12-13 13:16:02 +00:00
Laurent Destailleur
cc93d642e0 Fix: Date was not always visible 2010-12-01 23:42:39 +00:00
Laurent Destailleur
dc3145e5dc Can create invoice from order only if order is "accepted" 2010-12-01 22:43:22 +00:00
Laurent Destailleur
6e75a3d203 Restore work lost by savannah backup 2010-12-01 21:16:28 +00:00
Laurent Destailleur
adfb9ea341 Sec: Removed security holes 2010-11-20 13:08:44 +00:00
Laurent Destailleur
8bc3bae49e New: Add suppliers orders to process in dashboard 2010-11-13 17:37:22 +00:00
Laurent Destailleur
46ad8917ad Perf: A little speed enhancement on document tabs. 2010-10-03 15:50:34 +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
Regis Houssin
156a1e6b29 Qual: uniformize code 2010-09-10 14:35:07 +00:00
Regis Houssin
9664f0af5f Qual: big uniformize code 2010-09-09 14:06:15 +00:00
Laurent Destailleur
a81f5c9acf Fix: Uniformize code 2010-09-08 07:35:11 +00:00
Laurent Destailleur
83d473f0d7 Qual: Uniformize code 2010-09-04 17:18:13 +00:00
Laurent Destailleur
060d2df3ea Fix: Can send supplier order by mail at everystep after "approved". 2010-09-04 17:12:09 +00:00
Laurent Destailleur
2368cc676e Work on task #10579 : Simplify code using editor 2010-09-04 12:52:06 +00:00
Laurent Destailleur
7917c17844 Work on task #10579 : Simplify code using editor 2010-09-02 19:10:34 +00:00
Laurent Destailleur
c9cfb4c075 Fix: Show correct information 2010-08-26 22:31:30 +00:00
Laurent Destailleur
5b9398ed16 Fix: Show correct information 2010-08-26 22:28:04 +00:00
Laurent Destailleur
ba9757bd6f Fix: Wrong value 2010-08-26 15:58:26 +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
Laurent Destailleur
f038ba869b Trad 2010-08-26 13:17:42 +00:00
Philippe Grand
fb06c15330 task #6689, strlen problem 
replace  strlen with dol_strlen
 2010-08-24 14:42:18 +00:00
Regis Houssin
2c4a56771f Fix: $optiontype not used 
Fix: select_array is deprecated
 2010-08-19 15:20:25 +00:00
Regis Houssin
9601f8a353 Fix: $optiontype not used 
Fix: select_array is deprecated
 2010-08-19 15:13:17 +00:00
Laurent Destailleur
60edde845d Fix: Database compatibility 2010-08-09 15:52:44 +00:00
Laurent Destailleur
2db5b658f1 Fix: Some errors in vat management with multiprice 2010-07-22 21:16:29 +00:00
Laurent Destailleur
a8eec4910a Doxygen 2010-07-21 12:47:18 +00:00
Laurent Destailleur
29536ecbd8 Fix: Use correct order of firstname and lastname. 2010-07-18 10:39:07 +00:00
Laurent Destailleur
321840ee67 Fix: A lot of fix in permissions 2010-07-15 20:48:40 +00:00
Juanjo Menent
99e970d6c9 Local Taxes: Remove MAIN_FEATURES_LEVEL condition 2010-07-15 07:23:04 +00:00
Laurent Destailleur
1315833247 Minor fixes. 2010-07-11 19:29:18 +00:00
Laurent Destailleur
eb4ee0d42d Fix: Some fix in project referrers page. Add also third party in a column. 2010-06-28 21:26:36 +00:00
Laurent Destailleur
c0521a20a9 Qual: Remove deprecated code 2010-06-17 16:53:26 +00:00
Laurent Destailleur
ba4a63a624 Fix: Type of product was lost on supplier order change. 2010-06-02 10:38:53 +00:00
Laurent Destailleur
d4e693af3b Fix: Fix a lot of permissions on project module 2010-05-28 23:26:08 +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
af7cfec808 New: Can now send supplier order by mail 2010-05-12 13:14:26 +00:00
Laurent Destailleur
83aebbb2ce Fix: Removed a duplicate permission 2010-05-12 12:41:38 +00:00
Laurent Destailleur
2a29f90d14 Fix: Bad path for some includes 
New: Add more predefined actions
 2010-05-12 11:58:58 +00:00
Laurent Destailleur
fa8a201d04 Mutualize a lot of code 2010-05-12 11:29:21 +00:00
Regis Houssin
635b44b906 Fix: if you rename a module, rename all 2010-05-10 04:50:39 +00:00
Laurent Destailleur
426317a355 Qual: Removed deprecated method 2010-05-09 15:15:10 +00:00
Laurent Destailleur
d2c92b91de Fix: Bad parameters 2010-05-09 15:04:16 +00:00
Laurent Destailleur
8374bf42bb Rename static object 2010-05-09 14:55:49 +00:00
Laurent Destailleur
33d88a661f Remove pdate 2010-05-08 17:17:17 +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
a981577553 according to new tree directory 2010-05-03 08:43:32 +00:00
Philippe Grand
8a9fe373d6 according to new tree directory 2010-05-03 08:43:32 +00:00
Philippe Grand
32025de202 according to new tree directory 2010-05-03 08:22:35 +00:00
Laurent Destailleur
968addfad3 Fix: Better error management in upload files 2010-05-01 14:28:48 +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
43123cdc9d Removed deprecated files 2010-04-28 12:37:57 +00:00
Philippe Grand
24725ce2a6 according to new tree directory 2010-04-28 10:11:41 +00:00
Philippe Grand
388470d146 according to new tree directory 2010-04-28 07:55:43 +00:00
Juanjo Menent
ab819101db Works on enhancement of local taxes. Prepare User Interface of documents 2010-04-24 16:00:48 +00:00