Commit Graph

3690 Commits

Author SHA1 Message Date
Laurent Destailleur
5bc74ad6ea Fix SQL injections #3300 2015-09-12 11:23:44 +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
Florian HENRY
a49f88c259 reveiw thirdparty list and add column and filter on country and typeent 2015-09-10 11:55:05 +02:00
Marcos García de La Fuente
c58b5a5117 Created CommandeFournisseur::hasDelay function 2015-09-06 19:23:46 +02:00
Marcos García de La Fuente
9ce8024f1e Merge remote-tracking branch 'upstream/develop' into refactor 2015-09-06 18:57:38 +02:00
Marcos García de La Fuente
47e62f2270 Created FactureFournisseur::hasDelay function 2015-09-06 18:47:26 +02:00
Laurent Destailleur
5fd6c44640 Fix error management 2015-08-31 13:00:24 +02:00
Aurélien Stride
1a3d8b5ae4 FIX : adjusted test for affecting supplier reference 2015-08-31 09:25:39 +02:00
Laurent Destailleur
3315978fd3 Merge remote-tracking branch 'origin/3.8' into develop 2015-08-30 21:22:28 +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
Raphaël Doursenaud
cea47f3e25 Added tags/categories management to suppliers
Suppliers part of #2571
2015-08-26 19:30:55 +02:00
Laurent Destailleur
8061ec9084 Fix translation 2015-08-24 15:59:17 +02:00
Laurent Destailleur
9a6e13d253 Fix test if empty was inverted 2015-08-19 19:45:24 +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
f9a7a49e78 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-31 11:06:54 +02:00
Laurent Destailleur
9569431f44 Fix ident 2015-07-31 11:06:25 +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
38d30b5590 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/fourn/facture/card.php
2015-07-21 00:17:11 +02:00
Marcos García de La Fuente
b64adcc065 FIX [ bug 1925 ] "Link to order" option in supplier invoices is not working properly
Patch submitted by Philippe (pheno) at https://doliforge.org/tracker/?func=detail&aid=1925&group_id=144
2015-07-19 15:13:27 +02:00
Laurent Destailleur
581b6d0001 Fix: missing status on contacts 2015-07-14 11:51:27 +02:00
Laurent Destailleur
1fb40565f4 Fix bad parameters of function select_date 2015-07-12 12:50:24 +02:00
Marcos García de La Fuente
670596685f Created function SupplierInvoiceLine::update and added missing localtax1_type and localtax2_type properties
Related to #2670
2015-07-05 13:34:06 +02:00
aspangaro
56831ecd16 Correct travis 2015-07-04 16:13:44 +02:00
Laurent Destailleur
ab01c40978 Merge pull request #3143 from marcosgdf/more-oop
Created function SupplierInvoiceLine::fetch and SupplierInvoiceLine::delete
2015-07-04 04:44:46 +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
bddee5d01f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-04 04:11:30 +02:00
Laurent Destailleur
5fafb08f91 Uniformize code 2015-07-04 04:11:16 +02:00
Laurent Destailleur
55dbc2dfe2 Merge pull request #3115 from sebhm/develop
add hook addMoreActionsButtons
2015-07-04 03:43:08 +02:00
Marcos García de La Fuente
9415bdd828 Created function SupplierInvoiceLine::fetch and SupplierInvoiceLine::delete 2015-07-03 19:17:45 +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
sebhm
84e51eff3c add hook addMoreActionsButtons
as in most Card, this hook is useful
2015-06-29 22:36:41 +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
f9831f908e Use print_liste_field_titre(); 2015-06-26 06:49:43 +02:00
aspangaro
9d2e964b00 Fix: print_liste_field_titre(''); 2015-06-26 06:23:29 +02:00
Laurent Destailleur
5a8e763099 Uniformize code for hooks
Uniformize page name societe.php into list.php
2015-06-22 15:48:48 +02:00
Alexis Algoud
21f0fc8229 FIX can receive new batch product on supplier order 2015-06-18 19:49:19 +02:00
BENKE Charlie
94341e83ed added ref supplier bill
more useful to match supplier bill than internal ref
2015-06-16 15:22:13 +02:00
Laurent Destailleur
fb1a3f3ea3 Rename alternative name 2015-06-16 12:04:11 +02:00
Laurent Destailleur
8b4e3096a6 Merge pull request #2412 from marcosgdf/commercial-name
NEW [ task #851 ] Add a new field: Commercial name
2015-06-16 11:44:03 +02:00
jfefe
745f0f7d7e Fix crlf 2015-06-15 14:24:24 +02:00
Marcos García de La Fuente
a496606826 Merge branch 'develop' into commercial-name
Conflicts:
	htdocs/societe/soc.php
2015-06-13 02:45:42 +02:00