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
guillaume
4ede9295a6
Correction de la gestion d'erreur.
2015-02-27 14:06:53 +01:00
Laurent Destailleur
828716420b
Comment of function was not correct
2015-02-26 16:19:45 +01:00
Laurent Destailleur
a87c867c28
Translation
2015-02-26 16:02:03 +01:00
Laurent Destailleur
4bde7e9f51
Fix: Missing error management
2015-02-26 14:25:30 +01:00
Laurent Destailleur
daabc113a5
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
README.md
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/cashjournal.php
2015-02-26 13:36:07 +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
Marcos García de La Fuente
f117b65a17
Removed silent operator for PHP 4 in function dol_html_entity_decode
2015-02-25 23:01:07 +01:00
Marcos García de La Fuente
f2fededd2c
Drop usage of deprecated dol_htmlentities function
2015-02-25 22:48:45 +01:00
Marcos García de La Fuente
fb959abc63
Misc PHPdoc fixes
2015-02-25 18:24:36 +01:00
Marcos García de La Fuente
0a5f17f179
Undefined variable + Unreachable statement
2015-02-25 18:06:54 +01:00
Marcos García de La Fuente
91fa823075
Marked getStaticMember as deprecated
2015-02-25 18:03:31 +01:00
Marcos García de La Fuente
40a5c15616
Improved getBrowserInfo documentation
2015-02-25 16:45:14 +01:00
Marcos García de La Fuente
f598963d6b
Fixed regression
2015-02-25 16:41:51 +01:00
guillaume
9839420a68
Correction de la gestion d'erreur.
2015-02-25 15:44:06 +01:00
guillaume
24b069fcb0
Utilisation de la librairie Sqlite3 et création de fonctions personnalisées pour la compatibilité avec MySQL. Certains formats de date ne sont pas complètement pris en compte.
2015-02-25 14:31:41 +01:00
guillaume
207fa671b1
Mise en place de l'initialisation de la base avec PDO SQlite
2015-02-25 09:04:11 +01:00
aspangaro
4803a1fb89
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2015-02-25 06:59:27 +01:00
Alexis Algoud
b4f3068141
NEW add PDF icon on linked element into project
2015-02-24 18:20:19 +01:00
Laurent Destailleur
3fb3e4af4e
Merge pull request #2386 from lrq3000/3.7
...
Fix lastrowid-*table* option when defining imports
2015-02-24 17:16:17 +01:00
Laurent Destailleur
fec9e222b1
Merge pull request #2391 from aspangaro/develop-patch10
...
FIXED: Module Expense Report - Correct init
2015-02-24 17:11:32 +01:00
Laurent Destailleur
72da9b52af
Merge pull request #2380 from marcosgdf/bug-1825
...
Better fix for bug 1825
2015-02-24 17:07:17 +01:00
Laurent Destailleur
fd9fc191fc
Merge pull request #2388 from aspangaro/develop-patch8
...
Module Expense Report: reactivate conflict with modDeplacement
2015-02-24 17:06:43 +01:00
Laurent Destailleur
f23234356e
Merge pull request #2387 from aspangaro/develop-patch7
...
Move new module Expense Report in hrm
2015-02-24 17:03:12 +01:00
Laurent Destailleur
714b3d277c
Merge pull request #2394 from aspangaro/develop-patch12
...
FIXED: Update licence to GPLv3
2015-02-24 16:56:01 +01:00
Laurent Destailleur
70c778c728
I keep this feature hidden, because according to package target,
...
dolibarr does not contains same files. We must first find a solution
before making this feature public.
2015-02-24 15:49:39 +01:00
Laurent Destailleur
562348eb34
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/fourn/commande/dispatch.php
2015-02-24 15:42:28 +01:00
Laurent Destailleur
74f15680e1
Fix missing fields into import of thirdparties.
...
Fix import failed to find type of companny from source file.
Fix import date of creation has wrong check rule.
2015-02-24 15:40:50 +01:00
Laurent Destailleur
44c392ca23
Fix missing profid5 and 6
2015-02-24 13:35:37 +01:00
Laurent Destailleur
472181a03b
Merge pull request #2374 from frederic34/filecheck
...
Files Integrity Checker
2015-02-24 10:08:39 +01:00
aspangaro
c1069eea47
FIXED: Update licence to GPLv3
2015-02-23 22:04:01 +01:00
aspangaro
be3fd5529a
FIXED: Module Expense Report - Correct init
2015-02-23 20:31:44 +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
11a0624e39
[CORE] FIX Travis phpcs (#incoterm).
2015-02-23 11:19:00 +01:00
Marcos García de La Fuente
7e07638fba
Little refactor
2015-02-23 10:51:43 +01:00
Marcos García de La Fuente
71b98ee82b
Safari can appear in iPad, iPod, iPhone and future Apple products, it is not fair to attach it to one of them.
2015-02-23 10:42:10 +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
c459794999
[CORE] gestion de l'affichage de l'incoterm sur les différents PDF de base (#incoterm).
2015-02-23 10:36:44 +01:00
aspangaro
d0cc072a58
Module Expense Report: reactivate conflictwith modDeplacement
2015-02-23 06:49:11 +01:00
aspangaro
95f211775b
Move new module Expense Report in hrm
2015-02-23 06:45:03 +01:00
Laurent Destailleur
1bba3a01e2
phpcs
2015-02-22 23:41:34 +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
Stephen L
fe62e038ca
Fix lastrowid-*table* option when defining imports (fix extrafields fk_object value)
...
Signed-off-by: Stephen L. <lrq3000@gmail.com >
2015-02-22 14:34:51 +01:00
Marcos García de La Fuente
702c19dab3
Refactored function getBrowserInfo
2015-02-22 13:17:57 +01:00
Laurent Destailleur
2bc6ac4671
Finished new module to manage expense reports !
...
Fix export to support corectly multicompany
2015-02-22 13:16:49 +01:00
Marcos García de La Fuente
ce916f3bcb
Better practice in getBrowserInfo
2015-02-22 12:35:51 +01:00
Laurent Destailleur
6d1324b463
Work on expense report module
2015-02-21 16:15:54 +01:00
aspangaro
3aa6c8c855
Correct auguria menu
2015-02-21 15:19:18 +01:00
Laurent Destailleur
30a5111c68
Work on expense report module
2015-02-21 15:18:05 +01:00
