[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 880a27: Fixed field name
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 880a27: Fixed field name |
Date: |
Sun, 09 Jun 2013 07:54:49 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 880a27f827483b80af304d6470d5f2050d5df529
https://github.com/Dolibarr/dolibarr/commit/880a27f827483b80af304d6470d5f2050d5df529
Author: Raphaël Doursenaud <address@hidden>
Date: 2013-06-04 (Tue, 04 Jun 2013)
Changed paths:
M htdocs/societe/societe.php
Log Message:
-----------
Fixed field name
Commit: 94d1f23721e8ecac23e4c3a98d92919735e1b7ea
https://github.com/Dolibarr/dolibarr/commit/94d1f23721e8ecac23e4c3a98d92919735e1b7ea
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-04 (Tue, 04 Jun 2013)
Changed paths:
M htdocs/societe/societe.php
Log Message:
-----------
Merge pull request #1019 from GPCsolutions/3.3-societefix
Fixed field name
Commit: a4841dacda59fec0e7a04d719dfc72648c84276f
https://github.com/Dolibarr/dolibarr/commit/a4841dacda59fec0e7a04d719dfc72648c84276f
Author: simnandez <address@hidden>
Date: 2013-06-05 (Wed, 05 Jun 2013)
Changed paths:
M htdocs/compta/prelevement/rejets.php
Log Message:
-----------
Fix: Warning missing argument 2 into withdrawals
Commit: 693f4f3b8bfa99fef1f89c01fe06e51e17bd5d3a
https://github.com/Dolibarr/dolibarr/commit/693f4f3b8bfa99fef1f89c01fe06e51e17bd5d3a
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-06 (Thu, 06 Jun 2013)
Changed paths:
M htdocs/core/lib/functions2.lib.php
M test/phpunit/NumberingModulesTest.php
Log Message:
-----------
Fix: Pb of offset in numbering. Add also phpunit test to detect and test
fix.
Conflicts:
test/phpunit/NumberingModulesTest.php
Commit: c78d5aa4a78a829849b7ec9dec1f3cf34c913d38
https://github.com/Dolibarr/dolibarr/commit/c78d5aa4a78a829849b7ec9dec1f3cf34c913d38
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-07 (Fri, 07 Jun 2013)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
Fix: Bad param 'zone' into printCommon
Commit: a27d71f083caf6598196b73a11704de88b00ccce
https://github.com/Dolibarr/dolibarr/commit/a27d71f083caf6598196b73a11704de88b00ccce
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-07 (Fri, 07 Jun 2013)
Changed paths:
M htdocs/cashdesk/affPied.php
M htdocs/cashdesk/facturation.php
M htdocs/cashdesk/tpl/facturation1.tpl.php
M htdocs/langs/en_US/cashdesk.lang
M htdocs/langs/fr_FR/cashdesk.lang
Log Message:
-----------
Fix: Miscellaneous fixes into cachdesk module:
- Missing footer in cashdesk module
- Wrong field label
- Do not use limit list (Freeze when too many product)
Commit: a88a3bb8778a9564140b3afff01a3746c18ed983
https://github.com/Dolibarr/dolibarr/commit/a88a3bb8778a9564140b3afff01a3746c18ed983
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-07 (Fri, 07 Jun 2013)
Changed paths:
M htdocs/cashdesk/css/style.css
R htdocs/cashdesk/img/bg_menu.png
Log Message:
-----------
Look: More neutral css to match with other skins
Commit: dd43f7a89021396eafc0e7b7e7e5abe7adb747ae
https://github.com/Dolibarr/dolibarr/commit/dd43f7a89021396eafc0e7b7e7e5abe7adb747ae
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-07 (Fri, 07 Jun 2013)
Changed paths:
M htdocs/cashdesk/facturation.php
Log Message:
-----------
Fix: memory not freed
Commit: 3c9fef8eea0ec44a60203ffbec53c18f76bb745e
https://github.com/Dolibarr/dolibarr/commit/3c9fef8eea0ec44a60203ffbec53c18f76bb745e
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-07 (Fri, 07 Jun 2013)
Changed paths:
M htdocs/comm/action/fiche.php
Log Message:
-----------
Fix: choice of percentage was lost
Commit: afbe6c1808ba68f35c49fa74b1c3251229affcba
https://github.com/Dolibarr/dolibarr/commit/afbe6c1808ba68f35c49fa74b1c3251229affcba
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-08 (Sat, 08 Jun 2013)
Changed paths:
M htdocs/langs/en_US/main.lang
Log Message:
-----------
Fix: translation
Commit: 2c71c898ebba584942aad5d548488919fbad6ca6
https://github.com/Dolibarr/dolibarr/commit/2c71c898ebba584942aad5d548488919fbad6ca6
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-08 (Sat, 08 Jun 2013)
Changed paths:
M htdocs/core/lib/pdf.lib.php
Log Message:
-----------
Fix: param lang not provided to price function
Commit: e13974b5f3df5f0df542fe923b7eef5b39701fab
https://github.com/Dolibarr/dolibarr/commit/e13974b5f3df5f0df542fe923b7eef5b39701fab
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-08 (Sat, 08 Jun 2013)
Changed paths:
M htdocs/includes/tcpdf/tcpdf.php
Log Message:
-----------
Fix: tcpdf bug
Commit: 0ffb01e3477b4ada8f1ddbeef95845567daca2e2
https://github.com/Dolibarr/dolibarr/commit/0ffb01e3477b4ada8f1ddbeef95845567daca2e2
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-08 (Sat, 08 Jun 2013)
Changed paths:
M htdocs/langs/el_GR/other.lang
Log Message:
-----------
Fix: Remove duplicate key
Commit: b4abe582374f139cc9dd849baa27b9553ca5f3eb
https://github.com/Dolibarr/dolibarr/commit/b4abe582374f139cc9dd849baa27b9553ca5f3eb
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-08 (Sat, 08 Jun 2013)
Changed paths:
M htdocs/core/lib/pdf.lib.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/includes/tcpdf/tcpdf.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
htdocs/core/lib/pdf.lib.php
Commit: 49dcc32374b89d4410ba16e3861aa21c67abe1d2
https://github.com/Dolibarr/dolibarr/commit/49dcc32374b89d4410ba16e3861aa21c67abe1d2
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-08 (Sat, 08 Jun 2013)
Changed paths:
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
Log Message:
-----------
Fix: Param lang forbidden into price function
Commit: bd4ca9f1ed31f2980b8faccfd2a86add8d7cf13e
https://github.com/Dolibarr/dolibarr/commit/bd4ca9f1ed31f2980b8faccfd2a86add8d7cf13e
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-08 (Sat, 08 Jun 2013)
Changed paths:
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into 3.4
Commit: 532c56002d35430225ed63579671464edfdcfefa
https://github.com/Dolibarr/dolibarr/commit/532c56002d35430225ed63579671464edfdcfefa
Author: Marcos García <address@hidden>
Date: 2013-06-08 (Sat, 08 Jun 2013)
Changed paths:
M htdocs/compta/facture/fiche-rec.php
M test/phpunit/NumberingModulesTest.php
Log Message:
-----------
Entities problem with error message in predefined invoice creation
Commit: 5eac7a0bccea136f6fa818ebf3edfb5e1fa16e3a
https://github.com/Dolibarr/dolibarr/commit/5eac7a0bccea136f6fa818ebf3edfb5e1fa16e3a
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-08 (Sat, 08 Jun 2013)
Changed paths:
M htdocs/compta/facture/fiche-rec.php
M test/phpunit/NumberingModulesTest.php
Log Message:
-----------
Merge pull request #1028 from marcosgdf/minor
Entities problem with error message in predefined invoice creation
Commit: 3cff899b44d636eab5a3502918c223858b7344d4
https://github.com/Dolibarr/dolibarr/commit/3cff899b44d636eab5a3502918c223858b7344d4
Author: Marcos García <address@hidden>
Date: 2013-06-08 (Sat, 08 Jun 2013)
Changed paths:
M htdocs/compta/facture/stats/index.php
M htdocs/product/composition/fiche.php
Log Message:
-----------
Removed debug message and wrong translation key
Commit: 7e8df8df72ea697628c64e09f43c9898bba46698
https://github.com/Dolibarr/dolibarr/commit/7e8df8df72ea697628c64e09f43c9898bba46698
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-08 (Sat, 08 Jun 2013)
Changed paths:
M htdocs/compta/facture/stats/index.php
M htdocs/product/composition/fiche.php
Log Message:
-----------
Merge pull request #1029 from marcosgdf/minor
Removed debug message and wrong translation key
Commit: 000de9530d5d5bff59efe3d46d202c39224c3ee2
https://github.com/Dolibarr/dolibarr/commit/000de9530d5d5bff59efe3d46d202c39224c3ee2
Author: Marcos García <address@hidden>
Date: 2013-06-08 (Sat, 08 Jun 2013)
Changed paths:
M htdocs/langs/es_ES/products.lang
M htdocs/product/fiche.php
Log Message:
-----------
Fixed wrong translation key and and improved es_ES translations
Commit: 17efbd41c75f6565cc1313f9c0f4dedcbab9a12f
https://github.com/Dolibarr/dolibarr/commit/17efbd41c75f6565cc1313f9c0f4dedcbab9a12f
Author: Marcos García <address@hidden>
Date: 2013-06-08 (Sat, 08 Jun 2013)
Changed paths:
M htdocs/langs/es_ES/products.lang
Log Message:
-----------
Improved es_ES translation
Commit: a06de736c27a4b3113316edbeacea4febaee24be
https://github.com/Dolibarr/dolibarr/commit/a06de736c27a4b3113316edbeacea4febaee24be
Author: Marcos García <address@hidden>
Date: 2013-06-08 (Sat, 08 Jun 2013)
Changed paths:
M htdocs/compta/facture/fiche-rec.php
M htdocs/compta/facture/stats/index.php
M htdocs/product/composition/fiche.php
M test/phpunit/NumberingModulesTest.php
Log Message:
-----------
Merge branch '3.4' into translations
Commit: cf6bfcc9c4aee94dd340ec73c69b61282ba2ece0
https://github.com/Dolibarr/dolibarr/commit/cf6bfcc9c4aee94dd340ec73c69b61282ba2ece0
Author: Marcos García <address@hidden>
Date: 2013-06-08 (Sat, 08 Jun 2013)
Changed paths:
M htdocs/comm/propal/stats/index.php
M htdocs/commande/stats/index.php
M htdocs/compta/facture/stats/index.php
Log Message:
-----------
Missing translations
Commit: 3b28de0a077894e85c921740094aa322af1fe8c1
https://github.com/Dolibarr/dolibarr/commit/3b28de0a077894e85c921740094aa322af1fe8c1
Author: Marcos García <address@hidden>
Date: 2013-06-08 (Sat, 08 Jun 2013)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/ecm/docmine.php
M htdocs/fourn/commande/fiche.php
Log Message:
-----------
Fixed some translation problems
Commit: d416a7397cb16ded870210dce79b48477ac1f7e6
https://github.com/Dolibarr/dolibarr/commit/d416a7397cb16ded870210dce79b48477ac1f7e6
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-08 (Sat, 08 Jun 2013)
Changed paths:
M htdocs/comm/propal/stats/index.php
M htdocs/commande/stats/index.php
M htdocs/compta/facture/stats/index.php
M htdocs/core/class/html.form.class.php
M htdocs/ecm/docmine.php
M htdocs/fourn/commande/fiche.php
M htdocs/langs/es_ES/products.lang
M htdocs/product/fiche.php
Log Message:
-----------
Merge pull request #1030 from marcosgdf/translations
Fixed wrong translation key and and improved translations
Commit: e85b72e4521943e9ba2135d7d2c9d52c41e82565
https://github.com/Dolibarr/dolibarr/commit/e85b72e4521943e9ba2135d7d2c9d52c41e82565
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-09 (Sun, 09 Jun 2013)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
Fix: Bad error management
Commit: a5f401f9138f3f75b66ff926f95a84aa683b2b57
https://github.com/Dolibarr/dolibarr/commit/a5f401f9138f3f75b66ff926f95a84aa683b2b57
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-09 (Sun, 09 Jun 2013)
Changed paths:
M test/phpunit/phpunittest.xml
Log Message:
-----------
Fix: phpunit file
Commit: 9bb539843fc6f1e80784ce8597813c9d0f9b6491
https://github.com/Dolibarr/dolibarr/commit/9bb539843fc6f1e80784ce8597813c9d0f9b6491
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-09 (Sun, 09 Jun 2013)
Changed paths:
M htdocs/comm/propal/stats/index.php
M htdocs/commande/stats/index.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/compta/facture/stats/index.php
M htdocs/core/class/html.form.class.php
M htdocs/ecm/docmine.php
M htdocs/fourn/commande/fiche.php
M htdocs/langs/es_ES/products.lang
M htdocs/product/composition/fiche.php
M htdocs/product/fiche.php
M test/phpunit/NumberingModulesTest.php
Log Message:
-----------
Merge branch '3.4' of address@hidden:Dolibarr/dolibarr.git into 3.4
Commit: 050819ce0b6e5a2ef0318c46e0f3fb38a75f1f8f
https://github.com/Dolibarr/dolibarr/commit/050819ce0b6e5a2ef0318c46e0f3fb38a75f1f8f
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-09 (Sun, 09 Jun 2013)
Changed paths:
M htdocs/holiday/common.inc.php
Log Message:
-----------
Fix: dead code
Commit: 51d11ff190e7365901429d3725ee78575851a5a0
https://github.com/Dolibarr/dolibarr/commit/51d11ff190e7365901429d3725ee78575851a5a0
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-09 (Sun, 09 Jun 2013)
Changed paths:
M htdocs/cashdesk/css/style.css
M htdocs/cashdesk/facturation.php
R htdocs/cashdesk/img/bg_menu.png
M htdocs/comm/action/fiche.php
M htdocs/comm/propal/stats/index.php
M htdocs/commande/stats/index.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/compta/facture/stats/index.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/ecm/docmine.php
M htdocs/fourn/commande/fiche.php
M htdocs/holiday/common.inc.php
M htdocs/langs/el_GR/other.lang
M htdocs/langs/en_US/main.lang
M htdocs/langs/es_ES/products.lang
M htdocs/main.inc.php
M htdocs/product/composition/fiche.php
M htdocs/product/fiche.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
htdocs/compta/facture/stats/index.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/includes/tcpdf/tcpdf.php
htdocs/langs/el_GR/other.lang
htdocs/langs/en_US/cashdesk.lang
htdocs/langs/en_US/main.lang
htdocs/langs/es_ES/products.lang
htdocs/main.inc.php
test/phpunit/NumberingModulesTest.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/1e0cb64bce46...51d11ff190e7