Commit Graph

9826 Commits

Author SHA1 Message Date
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
00bf8caa8c FIX #4870 2016-03-25 17:55:58 +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
c8fd12cdaa Update code comment 2016-03-25 17:14:20 +01:00
BENKE Charlie
bf2d52894a correct travis too 2016-03-25 16:48:45 +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
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
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
Andreas Pachler
0d308f74be Added functionality to get project customer contact as contact_xx tags 2016-03-24 09:16:24 +01:00
aspangaro
bec5e5958a NEW: Move HRM dictionary from module to core dictionaries 2016-03-24 06:28:12 +01:00
Juanjo Menent
922c57da76 NEW #3510 : Standardize module 2016-03-23 22:45:04 +01:00
Laurent Destailleur
54ac3c0a7b Fix regression 2016-03-22 17:41:42 +01:00
Laurent Destailleur
95a45e8f87 Prepare code to be able to download ODT templates 2016-03-22 17:35:58 +01:00
Laurent Destailleur
ced1462b75 Fix regression 2016-03-22 16:59:54 +01:00
Alexis Algoud
c3bdc6372d NEW allow project to be shared across entities 2016-03-22 16:48:51 +01:00
Laurent Destailleur
4f3f1eda7b FIX Duplicate records into export 2016-03-22 12:55:29 +01:00
Laurent Destailleur
876484dfb5 FIX Duplicate records into export 2016-03-22 12:54:26 +01:00
Marcos García de La Fuente
89bd173c2f NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate 2016-03-21 21:51:29 +01:00
Juanjo Menent
fbe34e9efc Merge pull request #4860 from aspangaro/4.0-p2
NEW: Move Expense report menu from module to menu files
2016-03-21 21:27:55 +01:00
Juanjo Menent
c323948669 Merge pull request #4856 from marcosgdf/pdf-phpdoc-fix
Corrected PHPDoc blocks of pdf.lib.php functions and added typehinting in their parameters
2016-03-21 20:40:07 +01:00
aspangaro
3c09e67453 Merge remote-tracking branch 'Upstream/develop' into 4.0-p2
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
2016-03-21 20:38:17 +01:00
Juanjo Menent
022958c8ad Merge pull request #4861 from aspangaro/4.0-p3
FIX: Some typo on auguria menu
2016-03-21 20:27:36 +01:00
Juanjo Menent
187a04854f Merge pull request #4862 from marcosgdf/form-selectarray2
Corrected non-static usages of several Form functions
2016-03-21 20:21:29 +01:00
Laurent Destailleur
d4f5076a84 Merge remote-tracking branch 'origin/3.9' into develop 2016-03-20 17:37:50 +01:00
Laurent Destailleur
706a7f05b8 FIX PHPCS 2016-03-20 17:37:27 +01:00
Laurent Destailleur
6b821f15d1 FIX Bad vat definition when using POS module 2016-03-20 17:36:13 +01:00
Marcos García de La Fuente
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
a0926abd13 NEW Converted Form::formconfirm function to a static function and removed deprecated function Form::form_confirm 2016-03-20 14:15:22 +01:00
Marcos García de La Fuente
5bdc3b9a1e NEW Converted Form::selectyesno, Form::showrefnav, Form::select_date, Form::showbarcode, Form::showfilterAndCheckAddButtons, Form::editfieldkey, Form::editfieldnav, Form::editInPlace, Form::selectMassActions to static functions 2016-03-20 14:15:22 +01:00
Marcos García de La Fuente
5a9e686bf9 NEW Converted Form::selectyesno to a static function 2016-03-20 14:15:22 +01:00
Marcos García de La Fuente
ff6b187ef3 NEW Converted Form::showLinkedObjectBlock to a static function 2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
4d78932fe8 NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions 2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
0a53cdd88f Corrected non-static usages of Form::multiselectarray function 2016-03-20 14:15:18 +01:00
Marcos García de La Fuente
87cd6e1e40 Corrected non-static usages of Form::selectarray function 2016-03-20 14:15:17 +01:00
aspangaro
0b1a689a24 FIX: Some typo on auguria menu 2016-03-20 08:08:28 +01:00
aspangaro
57ebb7c997 NEW: Move Expense report menu from module to menu files 2016-03-20 07:34:48 +01:00