Commit Graph

54672 Commits

Author SHA1 Message Date
Laurent Destailleur
0727ee88e6 More robust initdemo script. 2016-03-12 18:33:32 +01:00
Laurent Destailleur
bad07bc38c Fix dos and bom and end of line 2016-03-12 18:30:19 +01:00
Laurent Destailleur
ba8e11d521 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-03-12 18:26:16 +01:00
Laurent Destailleur
368b4c621f Fix phpcs 2016-03-12 18:25:41 +01:00
Laurent Destailleur
7b576b634a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-03-12 18:25:16 +01:00
Laurent Destailleur
58988e4ad2 Fix not visible menu title 2016-03-12 18:22:44 +01:00
Laurent Destailleur
2e3b4c3748 Fix not visible menu title with small screen 2016-03-12 16:24:33 +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
eb65707da8 Fix code to publishing packages on foundation server 2016-03-12 12:50:05 +01:00
Laurent Destailleur
731d1cfe41 Update changelog for 3.8.4 3.8.4 2016-03-12 12:07:11 +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
e3df749666 Merge pull request #4796 from hregis/3.8_bug
Fix: wrong fk_parent_line in credit note with invoiceAvoirWithLines
2016-03-12 11:47:05 +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
87c6a1f84c Merge pull request #4797 from FHenry/3.9
accoutancy fix error return
2016-03-12 11:45:09 +01:00
Laurent Destailleur
fe955b8c51 Merge pull request #4799 from hregis/3.8_order
Fix: $fileparams is not defined
2016-03-12 11:45:00 +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
444fce0bd9 Prepare 3.7.4 3.7.4 2016-03-11 18:34:05 +01:00
Laurent Destailleur
e669dac398 Prepare 3.6.7 2016-03-11 18:28:39 +01:00
Laurent Destailleur
32d0f9a8d7 Prepare 3.6.7 2016-03-11 18:27:04 +01:00
Laurent Destailleur
a45ffeecca Missing changelog 2016-03-11 18:21:57 +01:00
Regis Houssin
7953f77b07 Fix: $fileparams is not defined 2016-03-11 18:08:27 +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
Florian HENRY
33c5658209 fix error return 2016-03-11 17:17:06 +01:00
Regis Houssin
f87bb1206e Fix: wrong fk_parent_line in credit note with invoiceAvoirWithLines
option
2016-03-11 15:42:14 +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
Laurent Destailleur
a9058df753 Fix bad field in select 2016-03-11 10:47:17 +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
d6f3a5c046 Fix bad path 2016-03-10 15:01:39 +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