Laurent Destailleur
|
612aa0ab04
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2016-03-22 15:50:56 +01:00 |
|
Laurent Destailleur
|
f686ef1d04
|
Uniformize look
|
2016-03-22 15:50:35 +01:00 |
|
aspangaro
|
53f2a7a0ac
|
Merge remote-tracking branch 'Upstream/develop' into 4.0-p2
|
2016-03-22 12:58:40 +01:00 |
|
Laurent Destailleur
|
8189a5eadd
|
Merge remote-tracking branch 'origin/3.8' into 3.9
|
2016-03-22 12:58:34 +01:00 |
|
aspangaro
|
72abdde912
|
Add in migration file 3.9 - 4.0, a sql operation to delete old menu of expense report
|
2016-03-22 12:57:45 +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 |
|
Sebastien Bechet
|
82f74ceb38
|
Postgresql compatibility patch + cosmetic
|
2016-03-22 10:09:41 +01:00 |
|
Juanjo Menent
|
10f30cf569
|
Merge pull request #4869 from marcosgdf/misc-fix
NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate
|
2016-03-21 22:31:46 +01:00 |
|
Marcos García
|
d15da596d8
|
Update ChangeLog
|
2016-03-21 22:24:46 +01:00 |
|
Marcos García de La Fuente
|
bfbcf7a64c
|
Unintended changes
|
2016-03-21 21:57:00 +01:00 |
|
Marcos García de La Fuente
|
d9dab762ad
|
Added changes to the changelog
|
2016-03-21 21:55:57 +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
|
19f6f7049d
|
Merge pull request #4850 from fentman/patch-2
Update main.lang
|
2016-03-21 20:31:25 +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 |
|
Juanjo Menent
|
5fabb7b1e1
|
Merge pull request #4865 from aspangaro/3.9-p20
FIX: Donation || Don't show project icon if fk_project is empty
|
2016-03-21 20:12:32 +01:00 |
|
aspangaro
|
8f1cbe9ed8
|
FIX: Donation || Don't show project icon if fk_project is empty
|
2016-03-21 12:59:30 +01:00 |
|
Laurent Destailleur
|
99ceb006e4
|
FIX Bad include and param for project numbering module call
|
2016-03-21 11:47:32 +01:00 |
|
phf
|
a6fa3a4c25
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_multicurrency_sync_rates
|
2016-03-20 21:58:24 +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 |
|
phf
|
600abc9794
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_multicurrency_sync_rates
|
2016-03-20 15:56:54 +01:00 |
|
phf
|
661ee72d55
|
UPDATE move ajax request in js file and call a new php file to update all rates
|
2016-03-20 15:17:30 +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 |
|
Marcos García de La Fuente
|
eff5e2ebd7
|
Replaced old AccountNumber key with BankAccountNumber key
|
2016-03-19 23:02:09 +01:00 |
|
Marcos García de La Fuente
|
889c72611d
|
NEW Created Account::__toString, Account::getFieldsToShow and Account::getAccountNumberOrder to refactor the way account number was shown
|
2016-03-19 23:00:33 +01:00 |
|
Laurent Destailleur
|
8689240b7f
|
Merge remote-tracking branch 'origin/3.9' into develop
|
2016-03-19 21:37:08 +01:00 |
|
Laurent Destailleur
|
af3256f84a
|
Fix first change to fix serious pb with vat definition when using the
POS.
|
2016-03-19 21:35:03 +01:00 |
|
Marcos García de La Fuente
|
7fbf16a202
|
Fixed an error including FormBank class
|
2016-03-19 20:51:43 +01:00 |
|
Marcos García de La Fuente
|
59bfac65aa
|
Little refactor
|
2016-03-19 20:48:37 +01:00 |
|
Marcos García de La Fuente
|
8ef122ad99
|
Fixed missing require bug
|
2016-03-19 20:12:41 +01:00 |
|
Marcos García de La Fuente
|
39d17c0132
|
Corrected PHPDoc blocks of pdf.lib.php functions and added typehinting in their parameters
|
2016-03-19 20:05:13 +01:00 |
|
Marcos García de La Fuente
|
1be9c53b6c
|
NEW Created FormBank::getIBANLabel function to get the label of "IBAN" depending on bank account country
|
2016-03-19 19:39:18 +01:00 |
|
Laurent Destailleur
|
ba4f5c8648
|
Merge remote-tracking branch 'origin/3.9' into develop
|
2016-03-19 19:26:57 +01:00 |
|
Laurent Destailleur
|
ee857055be
|
Merge remote-tracking branch 'origin/3.8' into 3.9
|
2016-03-19 19:26:25 +01:00 |
|
Laurent Destailleur
|
660f825a34
|
Fix regression description line not visible
|
2016-03-19 19:25:28 +01:00 |
|