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
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
Laurent Destailleur
3c8d54d55f
Merge pull request #2938 from FHenry/3.6
...
FIX : If supplier invoice block linked element is display after other block total HT amount is not reset to 0 and sum other block (like customer orders values)
2015-06-05 15:43:25 +02:00
Maxime Kohlhaas
f7493de50c
Fix : supplier order clone was buggy if notes contains apostrophe
2015-06-05 13:42:29 +02:00
jfefe
195a1b2708
FIX #2957 : missing $langs object for trigger
2015-06-04 18:10:29 +02:00
Florian HENRY
fb29fa486a
FIX : total amount in tpl linked object are not reset
2015-06-02 11:20:08 +02:00
Florian HENRY
3f1613197e
FIX : If supplier invoice block linked element is display after other
...
block total HT amount is not reset to 0 and sum other block (like
customer orders values)
2015-06-02 08:41:42 +02:00
Laurent Destailleur
1714b8bdbe
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-05-10 23:44:02 +02:00
Laurent Destailleur
8b596d7a69
Fix css missing
2015-05-10 23:43:18 +02:00
Juanjo Menent
577c872aaf
Code fixes
2015-05-07 20:44:31 +02:00
Juanjo Menent
459737e171
Merge pull request #2625 from marcosgdf/bug-2601
...
Fix bug #2601 Supplier orderstoinvoice does not work with PostgreSQL
2015-04-18 15:03:01 +02:00
Marcos García de La Fuente
b5ed65f838
Fix: [ bug #2598 ] Untranslated "Supplier" tab name and some tax inputs in /fourn/card.php
2015-04-18 10:50:07 +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
Marcos García de La Fuente
50091dfe8b
Closes #2534 SQL error when editing a supplier invoice line
2015-04-04 17:44:52 +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
dc0d3504dd
Fix: Bad notification key
2015-03-23 14:52:47 +01:00
Laurent Destailleur
9e0aa22a04
Merge pull request #2461 from tiaris/3.7_langs_error
...
Add global $langs to method, necessary for triggers to function
2015-03-20 20:43:16 +01:00
Laurent Destailleur
d442ac328c
Fix: some replacement tags were missing
2015-03-19 12:34:03 +01:00
jean
9e9a8894ea
Add global $langs to method, necessary for triggers to function
...
correctly
2015-03-17 14:20:08 +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
6c1c1fd691
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/comm/action/index.php
htdocs/core/lib/agenda.lib.php
htdocs/fourn/paiement/fiche.php
2015-03-05 11:35:39 +01:00
Marcos García de La Fuente
77605bce3e
[ bug #1892 ] PHP Fatal error when using USER_UPDATE_SESSION trigger and adding a supplier invoice payment
2015-03-02 13:33:31 +01:00
Laurent Destailleur
8a00109baf
Fix: Several bugs int replenishment feature.
2015-03-01 16:05:20 +01:00
Laurent Destailleur
1cdd77a671
Fix: use bad var
2015-02-28 18:18:41 +01:00
Laurent Destailleur
d6438a51ab
Add log to help track bug
2015-02-26 15:24:15 +01:00
Laurent Destailleur
4bde7e9f51
Fix: Missing error management
2015-02-26 14:25:30 +01:00
Laurent Destailleur
41a74c62e2
Fix trigger to insert lines where called when inserting line but also
...
when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.
2015-02-26 13:03:17 +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
4128c86035
Fix: Filter on statut was lost
2015-02-23 19:31:42 +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
774389940e
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/comm/propal/list.php
htdocs/compta/bank/ligne.php
htdocs/compta/resultat/clientfourn.php
htdocs/compta/salaries/fiche.php
htdocs/core/lib/functions.lib.php
htdocs/fourn/facture/paiement.php
2015-02-18 23:51:41 +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
fc415fc3c9
Fix: [ bug #1826 ] Supplier payment types are not translated in
...
fourn/facture/paiement.php
2015-02-18 22:44:42 +01:00
Laurent Destailleur
ad67fe50a3
Correct management when delivery date is universal time format.
2015-02-17 17:21:41 +01:00
Gauthier
105e024c48
@param desc
2015-02-12 13:20:03 +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
35129f2192
Fix PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS option not correctly
...
supported.
Fix: No limit on ldap search on dolibarr side.
2015-02-06 16:33:33 +01:00
Laurent Destailleur
a35bd9a3e4
Fixed bad sql request
2015-01-31 00:27:11 +01:00
Laurent Destailleur
0ea4a5db7d
Fixed: Error management on triggers
2015-01-31 00:08:45 +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
jean
b809f0aeb8
Merge remote-tracking branch 'origin/3.6' into 3.6
2015-01-20 17:31:17 +01:00
Laurent Destailleur
5c5ff72ecd
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/adherents/fiche.php
htdocs/comm/fiche.php
htdocs/comm/mailing/fiche.php
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/compta/paiement.php
htdocs/core/class/html.formcompany.class.php
htdocs/core/tpl/login.tpl.php
htdocs/expedition/fiche.php
htdocs/fourn/commande/fiche.php
htdocs/fourn/facture/fiche.php
htdocs/fourn/facture/paiement.php
htdocs/fourn/fiche.php
htdocs/main.inc.php
htdocs/product/fournisseurs.php
htdocs/resource/card.php
2015-01-18 17:13:42 +01:00
Laurent Destailleur
7c5927ef93
Merge branch 'bug-1796' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-1796
Conflicts:
ChangeLog
2015-01-18 15:08:49 +01:00
Marcos García de La Fuente
7f59cf9194
Fix: [ bug #1787 ] Incorrect behaviour of doActions hook
2015-01-17 19:28:27 +01:00
Marcos García de La Fuente
41e01a22a3
Fixed loading of external numeration modules in Contrat, Commande, Facture, Contrat, Expedition, Fichinter, CommandeFournisseur and uniformized code
2015-01-17 18:58:05 +01:00
Marcos García de La Fuente
ed839114ab
Fixed loading of external numeration modules in FactureFournisseur and Propal
2015-01-17 18:42:19 +01:00
Laurent Destailleur
6f00cecd81
Merge pull request #2244 from KreizIT/fix_default_empty
...
FIX : Creating default object from empty when validating supplier order
2015-01-16 12:03:23 +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
Marcos García de La Fuente
71b609fab0
Fix: [ bug #1801 ] FAC_FORCE_DATE_VALIDATION constant alters supplier invoice date given to numeration modules
2015-01-15 13:08:33 +01:00
