[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 3ff9fe: Fix: Add missing key language
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 3ff9fe: Fix: Add missing key language for propal |
|
Date: |
Tue, 12 Jan 2016 14:10:32 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 3ff9fe3123006307373f6904cadbe06df64082ec
https://github.com/Dolibarr/dolibarr/commit/3ff9fe3123006307373f6904cadbe06df64082ec
Author: aspangaro <address@hidden>
Date: 2016-01-09 (Sat, 09 Jan 2016)
Changed paths:
M htdocs/comm/index.php
M htdocs/langs/en_US/propal.lang
Log Message:
-----------
Fix: Add missing key language for propal
Commit: e82f7761bc686ad677750318a587e07a5ec418df
https://github.com/Dolibarr/dolibarr/commit/e82f7761bc686ad677750318a587e07a5ec418df
Author: aspangaro <address@hidden>
Date: 2016-01-10 (Sun, 10 Jan 2016)
Changed paths:
M htdocs/categories/traduction.php
M htdocs/core/class/html.formother.class.php
Log Message:
-----------
Merge remote-tracking branch 'Upstream/3.9' into 3.9-p1
Commit: af9e46d179ac28958757359fb5afe40d6771f230
https://github.com/Dolibarr/dolibarr/commit/af9e46d179ac28958757359fb5afe40d6771f230
Author: aspangaro <address@hidden>
Date: 2016-01-10 (Sun, 10 Jan 2016)
Changed paths:
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/eldy.lib.php
Log Message:
-----------
Fix: Wrong language file for 2 menu entries in accountancy module
Commit: 87f1e55bcbdc357a15093e9e20ed0dd2366ef832
https://github.com/Dolibarr/dolibarr/commit/87f1e55bcbdc357a15093e9e20ed0dd2366ef832
Author: aspangaro <address@hidden>
Date: 2016-01-10 (Sun, 10 Jan 2016)
Changed paths:
M htdocs/user/class/userbankaccount.class.php
Log Message:
-----------
Fix: SQL error on user bank tab
Commit: 965a96784cfdc36f33912aa804f3c4380f9d2ac2
https://github.com/Dolibarr/dolibarr/commit/965a96784cfdc36f33912aa804f3c4380f9d2ac2
Author: aspangaro <address@hidden>
Date: 2016-01-10 (Sun, 10 Jan 2016)
Changed paths:
M htdocs/core/modules/dons/html_cerfafr.html
M htdocs/core/modules/dons/html_cerfafr.modules.php
Log Message:
-----------
Fix: Donation some problems with french article
Commit: fddd02eecc00641a5e941be8070d2802d55bf6ed
https://github.com/Dolibarr/dolibarr/commit/fddd02eecc00641a5e941be8070d2802d55bf6ed
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-10 (Sun, 10 Jan 2016)
Changed paths:
M htdocs/holiday/class/holiday.class.php
M htdocs/holiday/define_holiday.php
Log Message:
-----------
Complete fix #4354
Commit: aa0b002119a8cf78ece6d48429c28b0b70d63415
https://github.com/Dolibarr/dolibarr/commit/aa0b002119a8cf78ece6d48429c28b0b70d63415
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-10 (Sun, 10 Jan 2016)
Changed paths:
M htdocs/holiday/card.php
Log Message:
-----------
Fix #4354
Commit: c22bc8a29e7419b8feef4a1fa4f1470f9427e025
https://github.com/Dolibarr/dolibarr/commit/c22bc8a29e7419b8feef4a1fa4f1470f9427e025
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-10 (Sun, 10 Jan 2016)
Changed paths:
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/eldy.lib.php
Log Message:
-----------
Merge pull request #4377 from aspangaro/3.9-p2
Fix: Wrong language file for 2 menu entries in accountancy module
Commit: ffe80a36e1895d9c1fbefca7275633007d579cf1
https://github.com/Dolibarr/dolibarr/commit/ffe80a36e1895d9c1fbefca7275633007d579cf1
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-10 (Sun, 10 Jan 2016)
Changed paths:
M htdocs/comm/index.php
M htdocs/langs/en_US/propal.lang
Log Message:
-----------
Merge pull request #4378 from aspangaro/3.9-p1
Fix: Add missing key language for propal
Commit: d8001a8e7ae47ae55dcfe0d2938ab1bde4bc4859
https://github.com/Dolibarr/dolibarr/commit/d8001a8e7ae47ae55dcfe0d2938ab1bde4bc4859
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-10 (Sun, 10 Jan 2016)
Changed paths:
M htdocs/user/class/userbankaccount.class.php
Log Message:
-----------
Merge pull request #4379 from aspangaro/3.9-p3
Fix: SQL error on user bank tab
Commit: 70ffcfea3373bb6171bb3c296a537e2eeab77dc0
https://github.com/Dolibarr/dolibarr/commit/70ffcfea3373bb6171bb3c296a537e2eeab77dc0
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-10 (Sun, 10 Jan 2016)
Changed paths:
M htdocs/core/modules/dons/html_cerfafr.html
M htdocs/core/modules/dons/html_cerfafr.modules.php
Log Message:
-----------
Merge pull request #4380 from aspangaro/3.9-p4
Fix: Donation some problems with french article
Commit: 694530bfaea1e9f494e65d2f37fb6fc92de6c2f3
https://github.com/Dolibarr/dolibarr/commit/694530bfaea1e9f494e65d2f37fb6fc92de6c2f3
Author: Regis Houssin <address@hidden>
Date: 2016-01-10 (Sun, 10 Jan 2016)
Changed paths:
M dev/skeletons/modMyModule.class.php
M htdocs/admin/modules.php
Log Message:
-----------
Fix: Gives the possibility to the module, to provide his own family info
and position of this family. (canceled $this->family)
Commit: bf098005407bf6e04c13aab8b3dea1bafe646a65
https://github.com/Dolibarr/dolibarr/commit/bf098005407bf6e04c13aab8b3dea1bafe646a65
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-10 (Sun, 10 Jan 2016)
Changed paths:
M htdocs/holiday/class/holiday.class.php
Log Message:
-----------
Fix function signature
Commit: 880a794acd7b4ac60ce896fb99673b8cb98ff192
https://github.com/Dolibarr/dolibarr/commit/880a794acd7b4ac60ce896fb99673b8cb98ff192
Author: aspangaro <address@hidden>
Date: 2016-01-10 (Sun, 10 Jan 2016)
Changed paths:
M htdocs/comm/index.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/dons/html_cerfafr.html
M htdocs/core/modules/dons/html_cerfafr.modules.php
M htdocs/holiday/card.php
M htdocs/holiday/class/holiday.class.php
M htdocs/holiday/define_holiday.php
M htdocs/langs/en_US/propal.lang
M htdocs/user/class/userbankaccount.class.php
Log Message:
-----------
Merge remote-tracking branch 'Upstream/3.9' into 3.9-p5
Commit: d7fdcc83bb3ec0299fd1f7bb51e19abbc78ae7bd
https://github.com/Dolibarr/dolibarr/commit/d7fdcc83bb3ec0299fd1f7bb51e19abbc78ae7bd
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-12 (Tue, 12 Jan 2016)
Changed paths:
M htdocs/product/list.php
Log Message:
-----------
Fix missing search criteria
Commit: 64026c41f88b0376cbffec45a154dafb76cc8371
https://github.com/Dolibarr/dolibarr/commit/64026c41f88b0376cbffec45a154dafb76cc8371
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-12 (Tue, 12 Jan 2016)
Changed paths:
M htdocs/comm/index.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/dons/html_cerfafr.html
M htdocs/core/modules/dons/html_cerfafr.modules.php
M htdocs/holiday/class/holiday.class.php
M htdocs/langs/en_US/propal.lang
M htdocs/user/class/userbankaccount.class.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 3.9
Commit: 233dc051a1f745871a2eb280e153bbbcec5ab4cf
https://github.com/Dolibarr/dolibarr/commit/233dc051a1f745871a2eb280e153bbbcec5ab4cf
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-12 (Tue, 12 Jan 2016)
Changed paths:
M dev/skeletons/modMyModule.class.php
M htdocs/admin/modules.php
Log Message:
-----------
Merge pull request #4384 from hregis/3.9_bug
Fix: Gives the possibility to the module, to provide his own family info
Commit: 0f53c496732295ca968799cbef41809d8a1669d9
https://github.com/Dolibarr/dolibarr/commit/0f53c496732295ca968799cbef41809d8a1669d9
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-12 (Tue, 12 Jan 2016)
Changed paths:
M htdocs/compta/hrm.php
Log Message:
-----------
Merge pull request #4392 from aspangaro/3.9-p5
Fix: HRM index typo and presentation
Commit: 381eea0dbfa7e8da434542107fe2319fc0cd9792
https://github.com/Dolibarr/dolibarr/commit/381eea0dbfa7e8da434542107fe2319fc0cd9792
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-12 (Tue, 12 Jan 2016)
Changed paths:
M dev/skeletons/modMyModule.class.php
M htdocs/admin/modules.php
M htdocs/comm/index.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/dons/html_cerfafr.html
M htdocs/core/modules/dons/html_cerfafr.modules.php
M htdocs/holiday/card.php
M htdocs/holiday/class/holiday.class.php
M htdocs/holiday/define_holiday.php
M htdocs/langs/en_US/propal.lang
M htdocs/product/list.php
M htdocs/user/class/userbankaccount.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
htdocs/core/menus/standard/eldy.lib.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/cd2695d1f589...381eea0dbfa7