phf
|
0a533660b8
|
Fix travis phpcs
|
2016-03-12 21:17:09 +01:00 |
|
phf
|
cc21f75c47
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_multicurrency_sync_rates
|
2016-03-12 13:16:22 +01:00 |
|
Laurent Destailleur
|
dca5e5278b
|
Merge pull request #4736 from marcosgdf/bankcateg-oop
NEW Moved code that deals with bank categories to BankCateg. Created BankCateg::fetchAll function
|
2016-03-12 12:01:32 +01:00 |
|
Laurent Destailleur
|
8cdc80bfb4
|
Merge pull request #4787 from grandoc/develop
[Qal] uniformize code
|
2016-03-12 11:52:57 +01:00 |
|
Laurent Destailleur
|
1527036565
|
Merge pull request #4798 from FHenry/develop
accoutancy fix error messages
|
2016-03-12 11:45:23 +01:00 |
|
Laurent Destailleur
|
e9c1723f8d
|
Fix phpunit tests
|
2016-03-12 11:39:21 +01:00 |
|
phf
|
3134af5013
|
Fix sync with currencylayer
|
2016-03-11 23:42:02 +01:00 |
|
Laurent Destailleur
|
7c950be468
|
Fix Phpcs
|
2016-03-11 18:04:45 +01:00 |
|
Florian HENRY
|
d7065751a1
|
fix error messages
|
2016-03-11 17:18:25 +01:00 |
|
Laurent Destailleur
|
7dac7c4f04
|
Merge remote-tracking branch 'origin/3.9' into develop
|
2016-03-11 11:00:53 +01:00 |
|
Laurent Destailleur
|
8b16a76936
|
Avoid duplicate translation
|
2016-03-11 10:59:28 +01:00 |
|
phf
|
da17e6e676
|
New add sync with api to create/update all rates
|
2016-03-10 23:52:06 +01:00 |
|
Marcos García de La Fuente
|
39f915d95d
|
Reverted use of BankCateg in Bank category listing
|
2016-03-10 19:52:27 +01:00 |
|
Laurent Destailleur
|
7a5353efb2
|
Make things clearer about option MAIN_ENABLE_LOG_TO_HTML
|
2016-03-10 18:36:09 +01:00 |
|
Laurent Destailleur
|
a8602dbec2
|
Fix alignement on extrafields
|
2016-03-10 16:00:44 +01:00 |
|
philippe grand
|
b495fdb58e
|
[Qal] uniformize code
|
2016-03-10 15:51:31 +01:00 |
|
Laurent Destailleur
|
2e1a63a1f3
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/langs/de_DE/companies.lang
htdocs/langs/fr_FR/compta.lang
htdocs/societe/class/societe.class.php
htdocs/societe/commerciaux.php
htdocs/societe/consumption.php
|
2016-03-10 15:09:30 +01:00 |
|
Laurent Destailleur
|
3b035819a9
|
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/core/modules/askpricesupplier/doc/doc_generic_askpricesupplier_odt.modules.php
htdocs/product/document.php
htdocs/societe/commerciaux.php
|
2016-03-10 15:03:53 +01:00 |
|
Laurent Destailleur
|
cddb54207f
|
Merge pull request #4769 from FHenry/develop
Extend element type of action comm (for long name external modules)
|
2016-03-10 14:12:11 +01:00 |
|
Laurent Destailleur
|
2d1c56cfaa
|
Merge pull request #4754 from defrance/patch-107
FIX : only enabled society is used for product select
|
2016-03-10 13:56:25 +01:00 |
|
Laurent Destailleur
|
ecf47109c0
|
Merge pull request #4739 from marcosgdf/accountline-oop
NEW Created AccountLine::insert function and started using it for transaction creation
|
2016-03-10 13:55:07 +01:00 |
|
Laurent Destailleur
|
79989c2f65
|
Merge pull request #4741 from marcosgdf/account-oop-properties
Fixed wrong Account class property used in bank/card.php
|
2016-03-10 13:53:17 +01:00 |
|
Laurent Destailleur
|
d663b28dac
|
Fix no database structure change is allowed into minor versions
|
2016-03-10 13:49:13 +01:00 |
|
Laurent Destailleur
|
f742d4ec66
|
Fix code corrupting database
|
2016-03-10 13:46:52 +01:00 |
|
Laurent Destailleur
|
80805f78ea
|
Disable too dangerous patch. Fix must be done by doing an insert only
without creating/renaming databases.
|
2016-03-10 13:43:09 +01:00 |
|
Laurent Destailleur
|
e346559219
|
Merge pull request #4770 from FHenry/3.8
FIX : #4768
|
2016-03-10 13:40:25 +01:00 |
|
Laurent Destailleur
|
9463b26476
|
Merge pull request #4774 from marcosgdf/bug-multiprice
Fixes a little problem with multiprice rules, now undefined ones evaluate to 0% variation
|
2016-03-10 13:35:27 +01:00 |
|
Laurent Destailleur
|
3d131de35c
|
Merge pull request #4778 from marcosgdf/bug-4777
FIX #4777 Error creating thirdparty with PostgreSQL
|
2016-03-10 13:34:34 +01:00 |
|
Laurent Destailleur
|
45ab31815b
|
Merge pull request #4767 from grandoc/3.9
fix : missing translation
|
2016-03-10 13:34:09 +01:00 |
|
Laurent Destailleur
|
21bf8824b9
|
Merge pull request #4738 from marcosgdf/account-libstatut
Refactored Account::libStatut and added object typehinting to some functions of Account class
|
2016-03-10 13:29:02 +01:00 |
|
Laurent Destailleur
|
216ca713f2
|
Merge pull request #4765 from defrance/patch-108
FIX : Error travis fail (bad comment)
|
2016-03-10 13:23:14 +01:00 |
|
Laurent Destailleur
|
155fd71f6d
|
Merge pull request #4734 from fappels/develop
Fix: add require to showDimensionInBestUnit
|
2016-03-10 13:22:58 +01:00 |
|
Laurent Destailleur
|
4fa84c8d8f
|
Merge pull request #4707 from marcosgdf/misc2
Removed deprecated usage of Account::account_currency_code and started using Account::canBeReconciliated
|
2016-03-10 13:21:51 +01:00 |
|
Laurent Destailleur
|
a61882d847
|
Sync transifex
|
2016-03-10 12:44:05 +01:00 |
|
Laurent Destailleur
|
a12d81cbda
|
Fix PHPCS
|
2016-03-10 12:36:25 +01:00 |
|
Florian HENRY
|
b58e155a6f
|
FIX : #4785
|
2016-03-10 12:22:49 +01:00 |
|
Laurent Destailleur
|
5bd5323c93
|
Finished to move the mergepdftool dedicated page into the generic "mass
actions" feature.
|
2016-03-10 12:11:11 +01:00 |
|
Florian HENRY
|
bb06356afb
|
qs
|
2016-03-10 11:43:07 +01:00 |
|
Florian HENRY
|
e40de3ce28
|
fix accoutancy
|
2016-03-10 11:39:26 +01:00 |
|
Florian HENRY
|
6138da8db6
|
Extend element type of action comm (for long name external modules)
|
2016-03-10 11:39:26 +01:00 |
|
Laurent Destailleur
|
d0441fa05f
|
NEW: Show into badge on tab head the number of dedicated contacts for
objects.
|
2016-03-10 11:16:12 +01:00 |
|
Laurent Destailleur
|
ba5b0efb53
|
The warning for late orders is visible on order card
|
2016-03-10 10:53:01 +01:00 |
|
philippe grand
|
6aa10a84df
|
Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into 3.9
|
2016-03-10 09:01:11 +01:00 |
|
Laurent Destailleur
|
e0681d0165
|
Fix unit not visible if not defined
|
2016-03-09 23:20:44 +01:00 |
|
Laurent Destailleur
|
8ab343e95f
|
Can choose number of decimals into function showDimensionInBestUnit
|
2016-03-09 23:17:46 +01:00 |
|
Marcos García de La Fuente
|
199597f93a
|
FIX #4777 Error creating thirdparty with PostgreSQL
Close #4777
|
2016-03-09 14:46:09 +01:00 |
|
Laurent Destailleur
|
c907ca85c9
|
Fix css
|
2016-03-08 20:32:41 +01:00 |
|
Laurent Destailleur
|
043abdce03
|
Fix sql error
|
2016-03-08 20:30:09 +01:00 |
|
Laurent Destailleur
|
4b0b1fb5f6
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/societe/consumption.php
|
2016-03-08 20:29:10 +01:00 |
|
Laurent Destailleur
|
e0cef69685
|
Merge remote-tracking branch 'origin/3.9' into develop
|
2016-03-08 20:21:42 +01:00 |
|