[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] a98e57: Fix: missing company logo and
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] a98e57: Fix: missing company logo and invert from to ! |
|
Date: |
Wed, 23 May 2012 02:58:46 -0700 |
Branch: refs/heads/3.2
Home: https://github.com/Dolibarr/dolibarr
Commit: a98e57c596a12d11c7599ea2dbf4f3a6af3348d0
https://github.com/Dolibarr/dolibarr/commit/a98e57c596a12d11c7599ea2dbf4f3a6af3348d0
Author: Regis Houssin <address@hidden>
Date: 2012-04-10 (Tue, 10 Apr 2012)
Changed paths:
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Log Message:
-----------
Fix: missing company logo and invert from to !
Commit: 6616254504f705879cdff8358a53dbc9fcdb5f60
https://github.com/Dolibarr/dolibarr/commit/6616254504f705879cdff8358a53dbc9fcdb5f60
Author: Regis Houssin <address@hidden>
Date: 2012-04-10 (Tue, 10 Apr 2012)
Changed paths:
M htdocs/admin/ihm.php
M htdocs/core/boxes/box_produits.php
M htdocs/langs/en_US/bills.lang
Log Message:
-----------
Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into 3.2
Commit: 8f32a35faa087d2758ea63a62d269e87156972cb
https://github.com/Dolibarr/dolibarr/commit/8f32a35faa087d2758ea63a62d269e87156972cb
Author: Regis Houssin <address@hidden>
Date: 2012-04-10 (Tue, 10 Apr 2012)
Changed paths:
M htdocs/core/lib/pdf.lib.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Log Message:
-----------
Fix: invert emetteur and problem with long phone number
Commit: 231fd6b2ae44b718286d30705c93f0b319d95b6c
https://github.com/Dolibarr/dolibarr/commit/231fd6b2ae44b718286d30705c93f0b319d95b6c
Author: Laurent Destailleur <address@hidden>
Date: 2012-04-10 (Tue, 10 Apr 2012)
Changed paths:
M htdocs/core/class/conf.class.php
Log Message:
-----------
Fix: Removed warning
Commit: d3198894b80e032578c2636de8bdd23e48a98314
https://github.com/Dolibarr/dolibarr/commit/d3198894b80e032578c2636de8bdd23e48a98314
Author: Laurent Destailleur <address@hidden>
Date: 2012-04-10 (Tue, 10 Apr 2012)
Changed paths:
M htdocs/core/lib/pdf.lib.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Log Message:
-----------
Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2
Commit: 6e291ad70fca1b3b32b279b79eb560d971727ff6
https://github.com/Dolibarr/dolibarr/commit/6e291ad70fca1b3b32b279b79eb560d971727ff6
Author: Cédric Salvador <address@hidden>
Date: 2012-04-16 (Mon, 16 Apr 2012)
Changed paths:
M ChangeLog
M build/debian/control
M build/debian/control.debianbin
M build/debian/dolibarr.postinst
M build/debian/dolibarr.postrm
M build/debian/install.forced.php.install
M build/debian/rules
M build/rpm/dolibarr_fedora.spec
M build/rpm/dolibarr_generic.spec
M build/rpm/dolibarr_mandriva.spec
M build/rpm/dolibarr_opensuse.spec
M build/rpm/install.forced.php.opensuse
M dev/initdata/initdemo.sh
A dev/initdata/mysqldump_dolibarr_3.2.0.sql
M htdocs/adherents/card_subscriptions.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/document.php
M htdocs/adherents/fiche.php
M htdocs/adherents/index.php
M htdocs/adherents/info.php
M htdocs/adherents/note.php
M htdocs/adherents/stats/geo.php
M htdocs/adherents/stats/index.php
M htdocs/adherents/type.php
M htdocs/admin/project.php
M htdocs/categories/categorie.php
M htdocs/commande/fiche.php
M htdocs/core/ajax/ajaxdirpreview.php
M htdocs/core/ajax/ajaxdirtree.php
M htdocs/core/class/conf.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/infobox.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/modules/commande/doc/pdf_edison.modules.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/dons/modules_don.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/facture/doc/pdf_oursin.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/propale/doc/pdf_jaune.modules.php
M htdocs/filefunc.inc.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/commande/fiche.php
M htdocs/fourn/commande/index.php
M htdocs/install/check.php
M htdocs/install/etape1.php
M htdocs/install/etape2.php
M htdocs/install/etape4.php
M htdocs/install/etape5.php
M htdocs/install/fileconf.php
M htdocs/install/mysql/data/llx_10_c_regions.sql
M htdocs/install/mysql/data/llx_20_c_departements.sql
M htdocs/install/mysql/data/llx_c_forme_juridique.sql
M htdocs/install/mysql/data/llx_c_tva.sql
M htdocs/install/mysql/data/llx_const.sql
M htdocs/projet/class/project.class.php
M htdocs/projet/class/task.class.php
M htdocs/theme/dolibarr_logo.png
M htdocs/user/fiche.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/3.2' into 3.2
Conflicts:
htdocs/core/class/conf.class.php
Commit: 6958fe9693ea56106b1230408db85c8910b4fc77
https://github.com/Dolibarr/dolibarr/commit/6958fe9693ea56106b1230408db85c8910b4fc77
Author: Raphaël Doursenaud <address@hidden>
Date: 2012-04-20 (Fri, 20 Apr 2012)
Changed paths:
M build/exe/doliwamp/doliwamp.iss
M build/makepack-dolibarr.pl
M htdocs/comm/propal/index.php
M htdocs/core/class/conf.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/document.php
M htdocs/fourn/facture/impayees.php
M htdocs/main.inc.php
M htdocs/product/liste.php
M htdocs/projet/tasks/contact.php
M htdocs/projet/tasks/document.php
M htdocs/projet/tasks/note.php
M htdocs/projet/tasks/task.php
M htdocs/projet/tasks/time.php
A htdocs/theme/eldy/img/liste_titre.png
A htdocs/theme/eldy/img/liste_titre2.png
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/3.2' into 3.2
Commit: 62ecc497faf2b8085e3986a1a15eaa6f8d5adb33
https://github.com/Dolibarr/dolibarr/commit/62ecc497faf2b8085e3986a1a15eaa6f8d5adb33
Author: Raphaël Doursenaud <address@hidden>
Date: 2012-04-26 (Thu, 26 Apr 2012)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Fix: typo in unset
Commit: dfcfb48057c886d073d02c77b33b8150a940c65c
https://github.com/Dolibarr/dolibarr/commit/dfcfb48057c886d073d02c77b33b8150a940c65c
Author: Raphaël Doursenaud <address@hidden>
Date: 2012-04-26 (Thu, 26 Apr 2012)
Changed paths:
M htdocs/langs/fr_FR/main.lang
Log Message:
-----------
Typo: instantanée ne prend qu'un n.
Commit: ea07afd6c2fa0596c7368208c7dd2f36d8288b84
https://github.com/Dolibarr/dolibarr/commit/ea07afd6c2fa0596c7368208c7dd2f36d8288b84
Author: Raphaël Doursenaud <address@hidden>
Date: 2012-05-02 (Wed, 02 May 2012)
Changed paths:
M ChangeLog
M htdocs/adherents/cartes/carte.php
M htdocs/adherents/fiche.php
M htdocs/adherents/liste.php
M htdocs/admin/commande.php
M htdocs/admin/mailing.php
M htdocs/admin/system/modules.php
M htdocs/admin/tools/update.php
M htdocs/comm/mailing/fiche.php
M htdocs/comm/propal.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/prelevement/class/bon-prelevement.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formcompany.class.php
M htdocs/core/class/menubase.class.php
M htdocs/core/db/mssql.class.php
M htdocs/core/db/mysql.class.php
M htdocs/core/db/mysqli.class.php
M htdocs/core/db/pgsql.class.php
M htdocs/core/db/sqlite.class.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/menus/standard/auguria.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
M htdocs/core/modules/fichinter/modules_fichinter.php
M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
M htdocs/core/modules/member/labels/pdf_standardlabel.class.php
M htdocs/core/modules/project/pdf/pdf_baleine.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/propale/doc/pdf_jaune.modules.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/core/tpl/login.tpl.php
M htdocs/filefunc.inc.php
M htdocs/install/mysql/migration/3.1.0-3.2.0.sql
M htdocs/langs/ca_ES/orders.lang
M htdocs/langs/en_US/ecm.lang
M htdocs/langs/en_US/orders.lang
M htdocs/langs/es_ES/orders.lang
M htdocs/langs/fr_FR/ecm.lang
M htdocs/langs/fr_FR/orders.lang
M htdocs/main.inc.php
M htdocs/paypal/lib/paypalfunctions.lib.php
M htdocs/projet/class/project.class.php
M htdocs/projet/contact.php
M htdocs/projet/fiche.php
M htdocs/public/agenda/agendaexport.php
M htdocs/public/emailing/mailing-read.php
M htdocs/public/emailing/mailing-unsubscribe.php
A htdocs/theme/bureau2crea/img/grip.png
M htdocs/theme/eldy/style.css.php
M htdocs/user/class/user.class.php
M htdocs/user/passwordforgotten.php
Log Message:
-----------
Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2
Commit: 9b4b8db189d24569d87171ea628a56a1e8fa43dd
https://github.com/Dolibarr/dolibarr/commit/9b4b8db189d24569d87171ea628a56a1e8fa43dd
Author: Raphaël Doursenaud <address@hidden>
Date: 2012-05-07 (Mon, 07 May 2012)
Changed paths:
M ChangeLog
M build/makepack-dolibarr.pl
M htdocs/commande/class/commande.class.php
M htdocs/commande/liste.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/contrat/class/contrat.class.php
M htdocs/contrat/index.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/db/mysql.class.php
M htdocs/core/db/pgsql.class.php
M htdocs/core/lib/security.lib.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/fichinter/contact.php
M htdocs/fichinter/fiche.php
M htdocs/filefunc.inc.php
M htdocs/fourn/facture/fiche.php
M htdocs/install/etape1.php
M htdocs/install/inc.php
M htdocs/install/mysql/tables/llx_commande.key.sql
M htdocs/install/mysql/tables/llx_facture.key.sql
M htdocs/install/mysql/tables/llx_propal.key.sql
M htdocs/install/repair.php
M htdocs/langs/ca_ES/ecm.lang
M htdocs/langs/de_DE/admin.lang
M htdocs/langs/de_DE/agenda.lang
M htdocs/langs/de_DE/banks.lang
M htdocs/langs/de_DE/bills.lang
M htdocs/langs/de_DE/bookmarks.lang
M htdocs/langs/de_DE/categories.lang
M htdocs/langs/de_DE/commercial.lang
M htdocs/langs/de_DE/companies.lang
M htdocs/langs/de_DE/compta.lang
M htdocs/langs/de_DE/contracts.lang
M htdocs/langs/de_DE/deliveries.lang
M htdocs/langs/de_DE/dict.lang
M htdocs/langs/de_DE/donations.lang
M htdocs/langs/de_DE/ecm.lang
M htdocs/langs/de_DE/errors.lang
M htdocs/langs/de_DE/exports.lang
M htdocs/langs/de_DE/ftp.lang
M htdocs/langs/de_DE/help.lang
M htdocs/langs/de_DE/install.lang
M htdocs/langs/de_DE/languages.lang
M htdocs/langs/de_DE/ldap.lang
M htdocs/langs/de_DE/mails.lang
M htdocs/langs/de_DE/main.lang
M htdocs/langs/de_DE/members.lang
M htdocs/langs/de_DE/orders.lang
M htdocs/langs/de_DE/other.lang
M htdocs/langs/de_DE/paybox.lang
M htdocs/langs/de_DE/paypal.lang
M htdocs/langs/de_DE/products.lang
M htdocs/langs/de_DE/projects.lang
M htdocs/langs/de_DE/propal.lang
M htdocs/langs/de_DE/sendings.lang
M htdocs/langs/de_DE/suppliers.lang
M htdocs/langs/de_DE/trips.lang
M htdocs/langs/de_DE/users.lang
M htdocs/langs/de_DE/withdrawals.lang
M htdocs/langs/en_US/bills.lang
M htdocs/langs/es_ES/ecm.lang
M htdocs/langs/it_IT/admin.lang
M htdocs/langs/it_IT/agenda.lang
M htdocs/langs/it_IT/banks.lang
M htdocs/langs/it_IT/bills.lang
M htdocs/langs/it_IT/bookmarks.lang
M htdocs/langs/it_IT/boxes.lang
M htdocs/langs/it_IT/cashdesk.lang
M htdocs/langs/it_IT/categories.lang
M htdocs/langs/it_IT/commercial.lang
M htdocs/langs/it_IT/companies.lang
M htdocs/langs/it_IT/compta.lang
M htdocs/langs/it_IT/contracts.lang
M htdocs/langs/it_IT/deliveries.lang
M htdocs/langs/it_IT/dict.lang
M htdocs/langs/it_IT/donations.lang
M htdocs/langs/it_IT/ecm.lang
M htdocs/langs/it_IT/errors.lang
M htdocs/langs/it_IT/exports.lang
M htdocs/langs/it_IT/externalsite.lang
M htdocs/langs/it_IT/ftp.lang
M htdocs/langs/it_IT/google.lang
M htdocs/langs/it_IT/help.lang
M htdocs/langs/it_IT/install.lang
M htdocs/langs/it_IT/interventions.lang
M htdocs/langs/it_IT/languages.lang
M htdocs/langs/it_IT/ldap.lang
M htdocs/langs/it_IT/mails.lang
M htdocs/langs/it_IT/main.lang
M htdocs/langs/it_IT/members.lang
M htdocs/langs/it_IT/orders.lang
M htdocs/langs/it_IT/oscommerce.lang
M htdocs/langs/it_IT/other.lang
M htdocs/langs/it_IT/paybox.lang
M htdocs/langs/it_IT/paypal.lang
M htdocs/langs/it_IT/products.lang
M htdocs/langs/it_IT/projects.lang
M htdocs/langs/it_IT/shop.lang
M htdocs/langs/it_IT/sms.lang
M htdocs/langs/it_IT/stocks.lang
M htdocs/langs/it_IT/suppliers.lang
M htdocs/langs/it_IT/trips.lang
M htdocs/langs/it_IT/users.lang
M htdocs/langs/it_IT/withdrawals.lang
M htdocs/langs/it_IT/workflow.lang
M htdocs/master.inc.php
M htdocs/product/fiche.php
M htdocs/projet/class/project.class.php
M htdocs/projet/fiche.php
M htdocs/projet/ganttview.php
M htdocs/projet/tasks/task.php
M htdocs/public/members/new.php
M htdocs/public/members/public_card.php
M htdocs/public/members/public_list.php
M htdocs/support/inc.php
Log Message:
-----------
Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2
Commit: 7a3ef9bf8add29803a3dabf691fa41bebc86923f
https://github.com/Dolibarr/dolibarr/commit/7a3ef9bf8add29803a3dabf691fa41bebc86923f
Author: Raphaël Doursenaud <address@hidden>
Date: 2012-05-07 (Mon, 07 May 2012)
Changed paths:
M htdocs/user/perms.php
Log Message:
-----------
Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2
Commit: decdc2a9a3b2337b1e09feadab809a87457a081f
https://github.com/Dolibarr/dolibarr/commit/decdc2a9a3b2337b1e09feadab809a87457a081f
Author: Raphaël Doursenaud <address@hidden>
Date: 2012-05-10 (Thu, 10 May 2012)
Changed paths:
M build/makepack-dolibarr.pl
M htdocs/adherents/admin/adherent.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/fiche.php
M htdocs/comm/mailing/fiche.php
M htdocs/comm/mailing/liste.php
M htdocs/contrat/fiche.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/admin.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/tpl/freeproductline_create.tpl.php
M htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
M htdocs/fourn/commande/fiche.php
M htdocs/fourn/facture/fiche.php
M htdocs/install/mysql/migration/repair.sql
M htdocs/product/class/product.class.php
M htdocs/projet/ganttchart.php
M htdocs/projet/ganttview.php
M htdocs/public/members/new.php
M htdocs/public/paypal/newpayment.php
M htdocs/public/paypal/paymentko.php
M htdocs/public/paypal/paymentok.php
M htdocs/theme/auguria/style.css.php
M htdocs/theme/bureau2crea/style.css.php
M htdocs/theme/cameleo/style.css.php
M htdocs/theme/eldy/style.css.php
M htdocs/user/group/perms.php
Log Message:
-----------
Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2
Commit: 3e72bdbc87f3df1b955bedef0f5ac5ad5cbb083f
https://github.com/Dolibarr/dolibarr/commit/3e72bdbc87f3df1b955bedef0f5ac5ad5cbb083f
Author: Raphaël Doursenaud <address@hidden>
Date: 2012-05-11 (Fri, 11 May 2012)
Changed paths:
M build/pad/DoliWamp.pml
M build/pad/Dolibarr.pml
M build/pad/pad_dolibarr.xml
M build/pad/pad_doliwamp.xml
M htdocs/commande/fiche.php
M htdocs/compta/facture.php
M htdocs/core/filemanagerdol/browser/default/browser.php
M htdocs/core/filemanagerdol/browser/default/frmactualfolder.php
M htdocs/core/filemanagerdol/browser/default/frmcreatefolder.php
M htdocs/core/filemanagerdol/browser/default/frmfolders.php
M htdocs/core/filemanagerdol/browser/default/frmresourceslist.php
M htdocs/core/filemanagerdol/browser/default/frmupload.php
M htdocs/install/mysql/data/llx_c_tva.sql
Log Message:
-----------
Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2
Commit: 8416014cff67d15f77c56c63d3261cb539bb542c
https://github.com/Dolibarr/dolibarr/commit/8416014cff67d15f77c56c63d3261cb539bb542c
Author: Raphaël Doursenaud <address@hidden>
Date: 2012-05-11 (Fri, 11 May 2012)
Changed paths:
M htdocs/admin/ldap.php
M htdocs/core/class/ldap.class.php
M htdocs/core/login/functions_ldap.php
M htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
M htdocs/user/class/user.class.php
M htdocs/user/class/usergroup.class.php
M htdocs/user/group/ldap.php
Log Message:
-----------
Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2
Commit: f7476d57271c0103ac7c9d03394305f08268c44c
https://github.com/Dolibarr/dolibarr/commit/f7476d57271c0103ac7c9d03394305f08268c44c
Author: Raphaël Doursenaud <address@hidden>
Date: 2012-05-15 (Tue, 15 May 2012)
Changed paths:
M htdocs/admin/syslog.php
M htdocs/admin/system/dolibarr.php
M htdocs/comm/action/fiche.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/contact/class/contact.class.php
M htdocs/contact/fiche.php
M htdocs/contact/ldap.php
M htdocs/core/class/ldap.class.php
M htdocs/core/db/pgsql.class.php
M htdocs/core/lib/date.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
M htdocs/install/mysql/migration/3.1.0-3.2.0.sql
M htdocs/install/mysql/migration/repair.sql
M htdocs/install/pgsql/functions/functions.sql
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/products.lang
M htdocs/langs/fr_FR/admin.lang
M htdocs/master.inc.php
M htdocs/public/demo/index.php
M htdocs/theme/bureau2crea/style.css.php
M htdocs/theme/cameleo/style.css.php
M scripts/invoices/rebuild_merge_pdf.php
M test/phpunit/ContactTest.php
M test/phpunit/FunctionsTest.php
Log Message:
-----------
Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2
Commit: 43f1fbed01457a914b3c1686d190150192577ea7
https://github.com/Dolibarr/dolibarr/commit/43f1fbed01457a914b3c1686d190150192577ea7
Author: Raphaël Doursenaud <address@hidden>
Date: 2012-05-16 (Wed, 16 May 2012)
Changed paths:
M htdocs/compta/paiement.php
Log Message:
-----------
Trim payment amounts
This allows to ignore trailing characters that may triggers a warning because
the payment looks greater than what's
required
Commit: 72f67f640d731abd5c20d2c5dc27ffdf06677065
https://github.com/Dolibarr/dolibarr/commit/72f67f640d731abd5c20d2c5dc27ffdf06677065
Author: Laurent Destailleur <address@hidden>
Date: 2012-05-23 (Wed, 23 May 2012)
Changed paths:
M htdocs/compta/paiement.php
M htdocs/langs/fr_FR/main.lang
Log Message:
-----------
Merge pull request #203 from GPCsolutions/3.2
3.2
Compare: https://github.com/Dolibarr/dolibarr/compare/04bb23d...72f67f6
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] a98e57: Fix: missing company logo and invert from to !,
Laurent Destailleur <=