[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] f6057b: Reverting PR #1002
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] f6057b: Reverting PR #1002 |
Date: |
Tue, 04 Jun 2013 13:59:48 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: f6057bd7943e46722513795f63f33448b4ab836a
https://github.com/Dolibarr/dolibarr/commit/f6057bd7943e46722513795f63f33448b4ab836a
Author: Marcos García <address@hidden>
Date: 2013-05-30 (Thu, 30 May 2013)
Changed paths:
M htdocs/langs/es_MX/banks.lang
M htdocs/langs/es_MX/bills.lang
Log Message:
-----------
Reverting PR #1002
Incorrect translation that shouldn't have been accepted
Commit: 694eef93868a2b550abac1b27eb98439700da5ac
https://github.com/Dolibarr/dolibarr/commit/694eef93868a2b550abac1b27eb98439700da5ac
Author: Juanjo Menent <address@hidden>
Date: 2013-05-30 (Thu, 30 May 2013)
Changed paths:
M htdocs/langs/es_MX/banks.lang
M htdocs/langs/es_MX/bills.lang
Log Message:
-----------
Merge pull request #1006 from marcosgdf/translations
Reverting PR #1002
Commit: 8ae0939ae57e18e29cdcec59106bbeb3d6a78dc1
https://github.com/Dolibarr/dolibarr/commit/8ae0939ae57e18e29cdcec59106bbeb3d6a78dc1
Author: Marcos García <address@hidden>
Date: 2013-06-01 (Sat, 01 Jun 2013)
Changed paths:
M ChangeLog
M htdocs/commande/liste.php
Log Message:
-----------
Fixed bug #903: Fatal error: Call to undefined function dol_get_first_day()
in htdocs/commande/liste.php
Commit: cf1d269f15e10a84c24f14e6991b7b37d333b2db
https://github.com/Dolibarr/dolibarr/commit/cf1d269f15e10a84c24f14e6991b7b37d333b2db
Author: Marcos García <address@hidden>
Date: 2013-06-01 (Sat, 01 Jun 2013)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
Avoid warnings
Commit: c8c9ea797d28b32a18c31ba845a4d536cafee469
https://github.com/Dolibarr/dolibarr/commit/c8c9ea797d28b32a18c31ba845a4d536cafee469
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-02 (Sun, 02 Jun 2013)
Changed paths:
M ChangeLog
M htdocs/commande/liste.php
Log Message:
-----------
Merge pull request #1009 from marcosgdf/bug-903
Fixed bug #903: Fatal error: Call to undefined function dol_get_first_da...
Commit: 4f0758f9b1be1a6a9d4cf59eb98523da98e447dd
https://github.com/Dolibarr/dolibarr/commit/4f0758f9b1be1a6a9d4cf59eb98523da98e447dd
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-02 (Sun, 02 Jun 2013)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
Merge pull request #1011 from marcosgdf/minor
Avoid warnings
Commit: 6cf1d255295680825740b31df8008254cac627aa
https://github.com/Dolibarr/dolibarr/commit/6cf1d255295680825740b31df8008254cac627aa
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-03 (Mon, 03 Jun 2013)
Changed paths:
M ChangeLog
M htdocs/commande/liste.php
M htdocs/langs/es_MX/banks.lang
M htdocs/langs/es_MX/bills.lang
M htdocs/product/class/product.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
ChangeLog
Commit: 4b3413c84c3712e4de42d14aa70d6375f946f5b3
https://github.com/Dolibarr/dolibarr/commit/4b3413c84c3712e4de42d14aa70d6375f946f5b3
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-03 (Mon, 03 Jun 2013)
Changed paths:
M htdocs/core/class/infobox.class.php
Log Message:
-----------
Fix: Loading of boxes from external modules
Commit: 1ff175f14e35b5060c76ebf758e2be58fdcc6b58
https://github.com/Dolibarr/dolibarr/commit/1ff175f14e35b5060c76ebf758e2be58fdcc6b58
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-03 (Mon, 03 Jun 2013)
Changed paths:
M htdocs/core/class/infobox.class.php
Log Message:
-----------
Fix: Bad regex
Commit: 1ccde6ad04b30e7ceb73fdbc7b00367c2cd40158
https://github.com/Dolibarr/dolibarr/commit/1ccde6ad04b30e7ceb73fdbc7b00367c2cd40158
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-03 (Mon, 03 Jun 2013)
Changed paths:
M htdocs/install/mysql/migration/repair.sql
Log Message:
-----------
Fix: syntax error
Commit: b4c5114ee669923a5539f382dda4e30762c845fb
https://github.com/Dolibarr/dolibarr/commit/b4c5114ee669923a5539f382dda4e30762c845fb
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-03 (Mon, 03 Jun 2013)
Changed paths:
M ChangeLog
M htdocs/adherents/stats/byproperties.php
M htdocs/adherents/stats/geo.php
M htdocs/adherents/stats/index.php
M htdocs/admin/supplier_order.php
M htdocs/comm/action/fiche.php
M htdocs/commande/liste.php
M htdocs/core/class/infobox.class.php
M htdocs/core/get_menudiv.php
M htdocs/core/lib/agenda.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/price.lib.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/core/modules/modAdherent.class.php
M htdocs/core/modules/modExternalRss.class.php
M htdocs/core/modules/modSociete.class.php
M htdocs/core/search_page.php
M htdocs/install/mysql/data/llx_20_c_departements.sql
M htdocs/install/mysql/data/llx_c_tva.sql
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
M htdocs/install/pgsql/functions/functions.sql
M htdocs/langs/es_MX/banks.lang
M htdocs/langs/es_MX/bills.lang
A htdocs/langs/fr_CA/admin.lang
A htdocs/langs/fr_CA/companies.lang
M htdocs/langs/fr_CA/main.lang
M htdocs/main.inc.php
M htdocs/product/class/product.class.php
M htdocs/product/fiche.php
M htdocs/societe/checkvat/checkVatPopup.php
M htdocs/support/default.css
M htdocs/support/inc.php
M htdocs/support/index.php
Log Message:
-----------
Merge branch '3.4' of address@hidden:Dolibarr/dolibarr.git into 3.4
Commit: 3127d66b17585da9dede01efb2074ad22573914a
https://github.com/Dolibarr/dolibarr/commit/3127d66b17585da9dede01efb2074ad22573914a
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-03 (Mon, 03 Jun 2013)
Changed paths:
M htdocs/core/class/html.formmail.class.php
Log Message:
-----------
Fix: Regression
Commit: e871ea64eb6d65486fb5fcafdf820909198191c9
https://github.com/Dolibarr/dolibarr/commit/e871ea64eb6d65486fb5fcafdf820909198191c9
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-03 (Mon, 03 Jun 2013)
Changed paths:
M htdocs/admin/mails.php
M htdocs/core/class/html.formmail.class.php
Log Message:
-----------
Fix: Regression
Commit: 0530b231bb796ab9d16505aa3df9e3db48abb674
https://github.com/Dolibarr/dolibarr/commit/0530b231bb796ab9d16505aa3df9e3db48abb674
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-03 (Mon, 03 Jun 2013)
Log Message:
-----------
Merge branch '3.4' of address@hidden:Dolibarr/dolibarr.git into 3.4
Commit: 205335f3478e92aed3aa74672b861a762b60a966
https://github.com/Dolibarr/dolibarr/commit/205335f3478e92aed3aa74672b861a762b60a966
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-03 (Mon, 03 Jun 2013)
Changed paths:
M htdocs/comm/mailing/fiche.php
M htdocs/theme/amarok/ckeditor/config.js
M htdocs/theme/auguria/ckeditor/config.js
M htdocs/theme/bureau2crea/ckeditor/config.js
M htdocs/theme/cameleo/ckeditor/config.js
Log Message:
-----------
Fix: Readonly mode for email was ok for eldy only.
Commit: 12973dbdb4cc501ccaf8eb595c241f5cbfcc1289
https://github.com/Dolibarr/dolibarr/commit/12973dbdb4cc501ccaf8eb595c241f5cbfcc1289
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-03 (Mon, 03 Jun 2013)
Changed paths:
M htdocs/admin/mails.php
M htdocs/admin/sms.php
M htdocs/install/mysql/data/llx_const.sql
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Look: Minor enhancement
Fix: Option to fix bug to send email on by default.
Commit: 26ac8f9f2828f1d3865e19593c959411b198278d
https://github.com/Dolibarr/dolibarr/commit/26ac8f9f2828f1d3865e19593c959411b198278d
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-03 (Mon, 03 Jun 2013)
Changed paths:
M htdocs/adherents/stats/byproperties.php
M htdocs/adherents/stats/geo.php
M htdocs/adherents/stats/index.php
Log Message:
-----------
Fix: Missing translation
Commit: 22bde298de5b009e0431fb96ceb5b78cd62cb3af
https://github.com/Dolibarr/dolibarr/commit/22bde298de5b009e0431fb96ceb5b78cd62cb3af
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-03 (Mon, 03 Jun 2013)
Changed paths:
M htdocs/core/modules/modOpenSurvey.class.php
Log Message:
-----------
Fix: First permission must start with 1
Commit: b1a280de325a1b68b5c1d97909932d53c88e56b8
https://github.com/Dolibarr/dolibarr/commit/b1a280de325a1b68b5c1d97909932d53c88e56b8
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-03 (Mon, 03 Jun 2013)
Changed paths:
M htdocs/public/members/new.php
Log Message:
-----------
Fix: error message
Commit: 3cb6e196b6edef9e00c29a3f27a4cf4861b27ac6
https://github.com/Dolibarr/dolibarr/commit/3cb6e196b6edef9e00c29a3f27a4cf4861b27ac6
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-03 (Mon, 03 Jun 2013)
Changed paths:
M htdocs/product/stock/class/mouvementstock.class.php
Log Message:
-----------
Fix: [ bug #919 ] SQL error in product/stock/product.php
Commit: 67758c963bb6f316c8b1709510180e644155c54b
https://github.com/Dolibarr/dolibarr/commit/67758c963bb6f316c8b1709510180e644155c54b
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-04 (Tue, 04 Jun 2013)
Changed paths:
M test/phpunit/AdherentTest.php
M test/phpunit/CommandeFournisseurTest.php
M test/phpunit/FunctionsTest.php
M test/phpunit/PdfDocTest.php
Log Message:
-----------
Fix: PHPUnit tests
Commit: eadfa66f2c8ae13ea951a9d5f7f10d9ce2752dce
https://github.com/Dolibarr/dolibarr/commit/eadfa66f2c8ae13ea951a9d5f7f10d9ce2752dce
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-04 (Tue, 04 Jun 2013)
Changed paths:
M ChangeLog
M htdocs/adherents/stats/byproperties.php
M htdocs/adherents/stats/geo.php
M htdocs/adherents/stats/index.php
M htdocs/admin/mails.php
M htdocs/admin/sms.php
M htdocs/comm/mailing/fiche.php
M htdocs/commande/liste.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/class/infobox.class.php
M htdocs/core/modules/modOpenSurvey.class.php
M htdocs/install/mysql/data/llx_const.sql
M htdocs/install/mysql/migration/repair.sql
M htdocs/langs/es_MX/banks.lang
M htdocs/langs/es_MX/bills.lang
M htdocs/product/class/product.class.php
M htdocs/public/members/new.php
M htdocs/theme/amarok/ckeditor/config.js
M htdocs/theme/auguria/ckeditor/config.js
M htdocs/theme/bureau2crea/ckeditor/config.js
M htdocs/theme/cameleo/ckeditor/config.js
M htdocs/theme/eldy/style.css.php
M test/phpunit/AdherentTest.php
M test/phpunit/CommandeFournisseurTest.php
M test/phpunit/FunctionsTest.php
M test/phpunit/PdfDocTest.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
htdocs/core/class/infobox.class.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/7b0897a6698b...eadfa66f2c8a