Raphaël Doursenaud
9f2545b95d
[Qual] Replaced deprecated dol_clone by native clone
2015-09-24 17:24:40 +02:00
Laurent Destailleur
f81df66564
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/.gitignore
htdocs/categories/edit.php
2015-09-23 00:34:57 +02:00
Laurent Destailleur
077c696c09
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/.gitignore
htdocs/theme/.gitignore
2015-09-22 16:28:34 +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
9cbd236c8c
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/filefunc.inc.php
2015-09-16 22:09:21 +02:00
Laurent Destailleur
e36928fd65
FIX #3529
2015-09-16 21:23:52 +02:00
Florian HENRY
8fd9d2a7ce
FIX : #3530
2015-09-16 10:21:32 +02:00
Laurent Destailleur
b94fb9e1f3
Merge remote-tracking branch 'origin/3.8' into develop
2015-09-12 18:22:10 +02:00
Laurent Destailleur
db3c544e21
Fix #3240 [Supplier orders] Dashboard links to unuseful page
2015-09-12 18:14:08 +02:00
Laurent Destailleur
94723a9b83
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/langs/en_US/accountancy.lang
2015-09-12 15:23:02 +02:00
Laurent Destailleur
1966d75ced
FIX #3490
2015-09-12 12:50:55 +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
36632593c0
Fix SQL injections #3300
2015-09-12 11:36:19 +02:00
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
