aspangaro
78af862c19
NEW: Add a search field and report on hrm area
2015-02-28 08:46:40 +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
Juanjo Menent
a67d0f712c
Trad: Syncro from transifex
2015-02-27 18:21:41 +01:00
Juanjo Menent
8c6ee6b7a8
Trad: Syncro from transifex
2015-02-27 18:20:35 +01:00
Juanjo Menent
856c8f24de
Fix: Bad SEPA xml file creation
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
2015-02-27 18:14:45 +01:00
Juanjo Menent
88d1d203d8
Fix: Bad SEPA xml file creation
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
2015-02-27 18:13:24 +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
Juanjo Menent
7ca8fdb20c
PHP norms
2015-02-27 17:58:19 +01:00
Juanjo Menent
bfe9bf7a47
Fix: Bad SEPA xml file creation
2015-02-27 17:55:15 +01:00
guillaume
4ede9295a6
Correction de la gestion d'erreur.
2015-02-27 14:06:53 +01:00
aspangaro
8f388aaa9b
Merge remote-tracking branch 'Upstream/3.7' into 3.7-patch4
2015-02-26 20:48:21 +01:00
aspangaro
47c41f6a85
Add a test to enable field only when module salary is used
2015-02-26 20:47:06 +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
8f378b4480
Fix no error returned when contact already exists
2015-02-26 15:52:14 +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
22318bb800
Fix missing tables
2015-02-26 14:05:23 +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
fe7889e266
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:19:19 +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
386eaf0911
Fix: bad sql request
2015-02-26 12:11:31 +01:00
Laurent Destailleur
b9d3175897
Fix typo
2015-02-25 23:04:13 +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
e3853a648f
Redundant code
2015-02-25 19:44:12 +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
Laurent Destailleur
be529e7269
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-02-25 16:53:33 +01:00
Marcos García de La Fuente
ceec3e926e
Typo
2015-02-25 16:47:34 +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
9fdb4a0ee3
Modification des attributs
2015-02-25 16:37:00 +01:00
guillaume
9839420a68
Correction de la gestion d'erreur.
2015-02-25 15:44:06 +01:00
Laurent Destailleur
76640b6b77
Fix removed warning
2015-02-25 15:01:25 +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
Laurent Destailleur
89684748c5
Debug incdec option.
2015-02-24 19:55:59 +01:00
Alexis Algoud
5bc3763945
fix supplier order element
2015-02-24 18:23:40 +01:00
Alexis Algoud
b4f3068141
NEW add PDF icon on linked element into project
2015-02-24 18:20:19 +01:00
Laurent Destailleur
d688db3b78
Merge branch 'atm-alexis-feature_Product_stock_subproduct_stock_independent' into develop
2015-02-24 17:24:11 +01:00
Laurent Destailleur
1c04af2e55
Merge branch 'feature_Product_stock_subproduct_stock_independent' of
...
https://github.com/atm-alexis/dolibarr into
atm-alexis-feature_Product_stock_subproduct_stock_independent
Conflicts:
htdocs/langs/en_US/products.lang
2015-02-24 17:23:23 +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
625c494dee
Merge pull request #2385 from aspangaro/3.7-patch5
...
FIXED: Bankjournal is generated from id_account now
2015-02-24 17:04:01 +01:00
