Commit Graph

52843 Commits

Author SHA1 Message Date
Laurent Destailleur
66eaffd9fa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-03-25 18:19:59 +01:00
Laurent Destailleur
facdddbb23 Merge pull request #4888 from defrance/patch-112
Add : new translations
2016-03-25 18:13:45 +01:00
Laurent Destailleur
6a58b025f8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-03-25 18:10:50 +01:00
Laurent Destailleur
bc1b2d048b Uniformise option name 2016-03-25 18:09:42 +01:00
Laurent Destailleur
6aba69c69c Merge pull request #4885 from aspangaro/4.0-p6
NEW: Move HRM dictionary from module to core dictionaries
2016-03-25 18:06:57 +01:00
Laurent Destailleur
423120db17 Merge pull request #4876 from atm-alexis/NEW_multientity_for_project
# New # multientity for project
2016-03-25 18:01:45 +01:00
Laurent Destailleur
46fe16be0b Merge pull request #4871 from sbechet/develop
Postgresql compatibility patch + cosmetic
2016-03-25 17:57:29 +01:00
Laurent Destailleur
f61f1c7a27 Merge pull request #4857 from marcosgdf/bankacc-misc
Little refactor
2016-03-25 17:43:56 +01:00
Laurent Destailleur
30aea901b8 Merge pull request #4855 from marcosgdf/account-oop
NEW Created FormBank::getIBANLabel function to get the label of "IBAN" depending on bank account country
2016-03-25 17:41:39 +01:00
Laurent Destailleur
34c197f268 Restore compatibility 2016-03-25 17:15:08 +01:00
Laurent Destailleur
c8fd12cdaa Update code comment 2016-03-25 17:14:20 +01:00
Laurent Destailleur
b29b5fa71d Merge pull request #4824 from FHenry/dev_jquery
Last version of JQuery 1.12 and DataTables Componenent with working
2016-03-25 16:50:26 +01:00
Laurent Destailleur
a0563b410e Merge remote-tracking branch 'origin/3.9' into develop 2016-03-25 16:24:26 +01:00
Laurent Destailleur
884ba3a0ba Fix bad hook function name 2016-03-25 16:23:09 +01:00
Laurent Destailleur
a2d6cf8549 Merge remote-tracking branch 'origin/3.9' into develop 2016-03-25 16:17:17 +01:00
Laurent Destailleur
9ddae7d7f3 Fix bad hook function name 2016-03-25 16:17:01 +01:00
Laurent Destailleur
7ca1e27103 Merge remote-tracking branch 'origin/3.9' into develop 2016-03-25 16:15:54 +01:00
Laurent Destailleur
f251ca579b Fix bad hook function name 2016-03-25 16:15:35 +01:00
Laurent Destailleur
ea9db792be Merge remote-tracking branch 'origin/3.9' into develop 2016-03-25 16:14:37 +01:00
Laurent Destailleur
7430d09739 Fix bad hook function name 2016-03-25 16:13:22 +01:00
Laurent Destailleur
85cd0038f5 Merge remote-tracking branch 'origin/3.9' into develop 2016-03-25 16:10:10 +01:00
Laurent Destailleur
5e55f0ecce Fix bad function name into hook 2016-03-25 16:07:42 +01:00
Laurent Destailleur
61bc8fc9ef NEW Can edit value date of a vat payment after recording it.
Conflicts:
	htdocs/compta/localtax/card.php
	htdocs/core/class/html.form.class.php
2016-03-25 16:01:45 +01:00
Juanjo Menent
aa9a39cab5 NEW #3510 : Standardize module 2016-03-25 15:59:44 +01:00
aspangaro
05df3408f2 Debug works 2016-03-25 15:59:38 +01:00
aspangaro
1d780e7e77 NEW: Accountancy - Add category to manage the display of the income
statement and the balance sheet

Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-03-25 15:59:31 +01:00
aspangaro
f8f55e05d0 NEW: Accountancy Add a way to initialize chart of accounts 2016-03-25 15:57:54 +01:00
aspangaro
3dc991974c FIX: Accountancy Bank journal Fix some problem with other module 2016-03-25 15:57:46 +01:00
Laurent Destailleur
a68b704daf FIX Must not return error when vars does not exists 2016-03-25 15:57:36 +01:00
Laurent Destailleur
80e10158a5 Add code comment 2016-03-25 15:57:29 +01:00
Laurent Destailleur
bb8e53deea Revert "Fix regression"
This reverts commit 5cd5a3a5fb.
2016-03-25 15:57:19 +01:00
Laurent Destailleur
88e5616622 Prepare code to be able to download ODT templates 2016-03-25 15:56:50 +01:00
Laurent Destailleur
5cd5a3a5fb Fix regression 2016-03-25 15:56:44 +01:00
Laurent Destailleur
e30d717e00 Uniformize look 2016-03-25 15:56:27 +01:00
aspangaro
642d7473a8 FIX: Donation || Don't show project icon if fk_project is empty 2016-03-25 15:54:09 +01:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Laurent Destailleur
a2e9832c8d Revert "Corrected non-static usages of Form::multiselectarray function"
This reverts commit 0a53cdd88f.
2016-03-25 15:34:43 +01:00
Laurent Destailleur
630f5a632d Revert "Corrected non-static usages of Form::selectarray function"
This reverts commit 87cd6e1e40.
2016-03-25 15:34:37 +01:00
Laurent Destailleur
68e06a4634 Revert "NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions"
This reverts commit 4d78932fe8.
2016-03-25 15:34:23 +01:00
Laurent Destailleur
4dc6acafe0 Revert "NEW Converted Form::selectyesno to a static function"
This reverts commit 5a9e686bf9.
2016-03-25 15:34:06 +01:00
Laurent Destailleur
2220f7f6f2 Revert "NEW Converted Form::formconfirm function to a static function and removed deprecated function Form::form_confirm"
This reverts commit a0926abd13.
2016-03-25 15:31:28 +01:00
Laurent Destailleur
e7a02d77a6 Revert commit 2016-03-25 15:31:17 +01:00
Laurent Destailleur
8ecfca5a9e Revert change that break compatiblity with 100% of modules 2016-03-25 15:26:46 +01:00
Laurent Destailleur
26de415b77 Revert commit that break compatibility of 100% of modules 2016-03-25 15:24:57 +01:00
Laurent Destailleur
46613cd72b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-03-25 14:50:00 +01:00
Laurent Destailleur
4ec41bc33b NEW Can edit value date of a vat payment after recording it. 2016-03-25 14:49:48 +01:00
Laurent Destailleur
4e1b46feeb Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-03-25 14:42:30 +01:00
Laurent Destailleur
bdead30e75 FIX Missing function 2016-03-25 14:42:16 +01:00
BENKE Charlie
efa7761b34 Add : new translations 2016-03-24 13:48:45 +01:00
aspangaro
bec5e5958a NEW: Move HRM dictionary from module to core dictionaries 2016-03-24 06:28:12 +01:00