[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 8bc689: Merge modif
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 8bc689: Merge modif |
|
Date: |
Wed, 26 Jun 2013 07:41:09 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 8bc68959e1b639cc5c07b24f79a34e667778aed4
https://github.com/Dolibarr/dolibarr/commit/8bc68959e1b639cc5c07b24f79a34e667778aed4
Author: Maxime Kohlhaas <address@hidden>
Date: 2013-06-21 (Fri, 21 Jun 2013)
Changed paths:
M htdocs/product/liste.php
M htdocs/societe/class/companybankaccount.class.php
Log Message:
-----------
Merge modif
Commit: d6a7a0ed71d8438e2d3efe13497328ad70286ed8
https://github.com/Dolibarr/dolibarr/commit/d6a7a0ed71d8438e2d3efe13497328ad70286ed8
Author: Maxime Kohlhaas <address@hidden>
Date: 2013-06-21 (Fri, 21 Jun 2013)
Changed paths:
M htdocs/adherents/index.php
M htdocs/comm/action/index.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/core/lib/functions2.lib.php
Log Message:
-----------
Commit
Commit: 5bbf914abc2b4db809c5c37a60093d5ea6f1000f
https://github.com/Dolibarr/dolibarr/commit/5bbf914abc2b4db809c5c37a60093d5ea6f1000f
Author: Maxime Kohlhaas <address@hidden>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M ChangeLog
R dev/findutf8bomincludes.sh
M dev/fixutf8bomfiles.sh
M htdocs/adherents/card_subscriptions.php
M htdocs/adherents/cotisations.php
M htdocs/adherents/index.php
M htdocs/admin/osc-languages.php
M htdocs/admin/system/database-tables.php
M htdocs/admin/system/dbtable.php
M htdocs/admin/system/modules.php
M htdocs/admin/tools/listsessions.php
M htdocs/bookmarks/liste.php
M htdocs/boutique/client/fiche.php
M htdocs/boutique/client/index.php
M htdocs/boutique/commande/ca.php
M htdocs/boutique/commande/fiche.php
M htdocs/boutique/commande/index.php
M htdocs/boutique/critiques/bestproduct.php
M htdocs/boutique/critiques/index.php
M htdocs/boutique/index.php
M htdocs/boutique/notification/index.php
M htdocs/boutique/notification/produits.php
M htdocs/boutique/produits/index.php
M htdocs/boutique/produits/osc-liste.php
M htdocs/boutique/promotion/index.php
M htdocs/comm/action/contact.php
M htdocs/comm/action/listactions.php
M htdocs/comm/bookmark.php
M htdocs/comm/contact.php
M htdocs/comm/fiche.php
M htdocs/comm/list.php
M htdocs/comm/mailing/cibles.php
M htdocs/comm/mailing/index.php
M htdocs/comm/mailing/liste.php
M htdocs/comm/propal/apercu.php
M htdocs/comm/propal/index.php
M htdocs/comm/propal/list.php
M htdocs/comm/remx.php
M htdocs/commande/apercu.php
M htdocs/commande/customer.php
M htdocs/commande/index.php
M htdocs/compta/bank/account.php
M htdocs/compta/bank/bilan.php
M htdocs/compta/bank/releve.php
M htdocs/compta/bank/search.php
M htdocs/compta/charges/index.php
M htdocs/compta/clients.php
M htdocs/compta/dons/stats.php
M htdocs/compta/facture/apercu.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/compta/facture/prelevement.php
M htdocs/compta/index.php
M htdocs/compta/localtax/clients.php
M htdocs/compta/localtax/index.php
M htdocs/compta/localtax/reglement.php
M htdocs/compta/paiement/avalider.php
M htdocs/compta/paiement/cheque/fiche.php
M htdocs/compta/paiement/cheque/index.php
M htdocs/compta/paiement/cheque/liste.php
M htdocs/compta/paiement/liste.php
M htdocs/compta/paiement_charge.php
M htdocs/compta/prelevement/bons.php
M htdocs/compta/prelevement/create.php
M htdocs/compta/prelevement/factures.php
M htdocs/compta/prelevement/fiche-stat.php
M htdocs/compta/prelevement/ligne.php
M htdocs/compta/prelevement/lignes.php
M htdocs/compta/prelevement/liste.php
M htdocs/compta/prelevement/rejets.php
M htdocs/compta/prelevement/stats.php
M htdocs/compta/recap-compta.php
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/sociales/index.php
M htdocs/compta/stats/index.php
M htdocs/compta/tva/clients.php
M htdocs/compta/tva/index.php
M htdocs/compta/tva/quadri.php
M htdocs/compta/tva/reglement.php
M htdocs/compta/ventilation/fournisseur/lignes.php
M htdocs/compta/ventilation/fournisseur/liste.php
M htdocs/compta/ventilation/lignes.php
M htdocs/compta/ventilation/liste.php
M htdocs/contact/class/contact.class.php
M htdocs/contact/list.php
M htdocs/contrat/fiche.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/dolprintipp.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formprojet.class.php
M htdocs/core/class/translate.class.php
M htdocs/core/db/pgsql.class.php
M htdocs/core/lib/company.lib.php
M htdocs/core/lib/cron.lib.php
M htdocs/core/lib/sendings.lib.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/auguria_menu.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/menus/standard/eldy_menu.php
M htdocs/core/menus/standard/empty.php
M htdocs/core/modules/modCron.class.php
M htdocs/core/search_page.php
M htdocs/core/tpl/contacts.tpl.php
M htdocs/core/tpl/login.tpl.php
M htdocs/cron/admin/cron.php
M htdocs/cron/card.php
M htdocs/cron/list.php
M htdocs/expedition/class/expedition.class.php
M htdocs/expedition/index.php
M htdocs/expedition/liste.php
M htdocs/exports/export.php
M htdocs/fichinter/apercu.php
M htdocs/fichinter/list.php
M htdocs/fourn/commande/dispatch.php
M htdocs/fourn/commande/history.php
M htdocs/fourn/commande/index.php
M htdocs/fourn/commande/liste.php
M htdocs/fourn/fiche.php
M htdocs/fourn/index.php
M htdocs/fourn/product/index.php
M htdocs/fourn/product/liste.php
M htdocs/fourn/recap-fourn.php
A htdocs/includes/jquery/plugins/mobile/images/ajax-loader.gif
R htdocs/includes/jquery/plugins/mobile/images/ajax-loader.png
M htdocs/includes/jquery/plugins/mobile/images/icons-18-black.png
M htdocs/includes/jquery/plugins/mobile/images/icons-18-white.png
M htdocs/includes/jquery/plugins/mobile/images/icons-36-black.png
M htdocs/includes/jquery/plugins/mobile/images/icons-36-white.png
M htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.css
M htdocs/includes/odtphp/odf.php
M htdocs/langs/ca_ES/other.lang
M htdocs/langs/en_US/cron.lang
M htdocs/langs/en_US/opensurvey.lang
M htdocs/langs/en_US/other.lang
M htdocs/langs/es_ES/other.lang
M htdocs/langs/fr_FR/admin.lang
M htdocs/langs/fr_FR/cron.lang
M htdocs/langs/fr_FR/holiday.lang
M htdocs/langs/fr_FR/opensurvey.lang
M htdocs/langs/fr_FR/other.lang
M htdocs/livraison/fiche.php
M htdocs/main.inc.php
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/tabs/productMargins.php
M htdocs/margin/tabs/thirdpartyMargins.php
M htdocs/opensurvey/public/create_survey.php
M htdocs/opensurvey/public/index.php
M htdocs/product/class/product.class.php
M htdocs/product/popuprop.php
M htdocs/product/price.php
M htdocs/product/stats/commande.php
M htdocs/product/stats/commande_fournisseur.php
M htdocs/product/stats/contrat.php
M htdocs/product/stats/facture.php
M htdocs/product/stats/facture_fournisseur.php
M htdocs/product/stock/index.php
M htdocs/product/stock/liste.php
M htdocs/product/stock/mouvement.php
M htdocs/product/stock/valo.php
M htdocs/projet/activity/index.php
M htdocs/projet/class/project.class.php
M htdocs/projet/element.php
M htdocs/projet/index.php
M htdocs/projet/tasks/contact.php
M htdocs/public/cron/cron_run_jobs.php
M htdocs/public/members/public_list.php
M htdocs/societe/commerciaux.php
M htdocs/societe/index.php
M htdocs/societe/soc.php
M htdocs/societe/societe.php
M htdocs/theme/amarok/style.css.php
M htdocs/theme/auguria/style.css.php
M htdocs/theme/bureau2crea/style.css.php
A htdocs/theme/cameleo/img/menus/holiday.png
M htdocs/theme/cameleo/style.css.php
M htdocs/theme/eldy/style.css.php
M htdocs/user/group/fiche.php
M htdocs/user/group/index.php
M htdocs/user/home.php
M htdocs/user/index.php
M scripts/contracts/email_expire_services_to_customers.php
M scripts/contracts/email_expire_services_to_representatives.php
M scripts/invoices/email_unpaid_invoices_to_customers.php
M scripts/invoices/email_unpaid_invoices_to_representatives.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: 0d3b7f1a0f88eca590e50adb56969c1d4773ec6d
https://github.com/Dolibarr/dolibarr/commit/0d3b7f1a0f88eca590e50adb56969c1d4773ec6d
Author: Maxime Kohlhaas <address@hidden>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M htdocs/compta/bank/account.php
M htdocs/core/lib/cron.lib.php
M htdocs/cron/card.php
M htdocs/cron/list.php
M htdocs/main.inc.php
M htdocs/opensurvey/public/index.php
M htdocs/public/cron/cron_run_jobs.php
M htdocs/theme/bureau2crea/style.css.php
M scripts/contracts/email_expire_services_to_customers.php
M scripts/contracts/email_expire_services_to_representatives.php
M scripts/invoices/email_unpaid_invoices_to_customers.php
Log Message:
-----------
merge
Commit: ac205aac2d71aaec65736ca2ba6a3872d2a61216
https://github.com/Dolibarr/dolibarr/commit/ac205aac2d71aaec65736ca2ba6a3872d2a61216
Author: Maxime Kohlhaas <address@hidden>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M htdocs/societe/societe.php
Log Message:
-----------
Add search on siren (idprof1)
Commit: af5db0482471feb118d662c675abe2633a60bb0a
https://github.com/Dolibarr/dolibarr/commit/af5db0482471feb118d662c675abe2633a60bb0a
Author: Maxime Kohlhaas <address@hidden>
Date: 2013-06-25 (Tue, 25 Jun 2013)
Changed paths:
M ChangeLog
M dev/skeletons/modMyModule.class.php
M htdocs/adherents/class/adherent.class.php
M htdocs/admin/modules.php
M htdocs/cashdesk/facturation.php
M htdocs/cashdesk/index.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/lib/invoice2.lib.php
M htdocs/core/modules/modCron.class.php
M htdocs/core/tpl/contacts.tpl.php
M htdocs/cron/list.php
M htdocs/document.php
M htdocs/includes/ckeditor/CHANGES.html
M htdocs/includes/ckeditor/INSTALL.html
M htdocs/includes/ckeditor/LICENSE.html
M htdocs/includes/ckeditor/adapters/jquery.js
M htdocs/includes/ckeditor/ckeditor.js
M htdocs/includes/ckeditor/ckeditor_basic.js
M htdocs/includes/ckeditor/ckeditor_basic_source.js
M htdocs/includes/ckeditor/ckeditor_source.js
M htdocs/includes/ckeditor/config.js
M htdocs/includes/ckeditor/contents.css
M htdocs/includes/ckeditor/lang/_languages.js
M htdocs/includes/ckeditor/lang/af.js
M htdocs/includes/ckeditor/lang/ar.js
M htdocs/includes/ckeditor/lang/bg.js
M htdocs/includes/ckeditor/lang/bn.js
M htdocs/includes/ckeditor/lang/bs.js
M htdocs/includes/ckeditor/lang/ca.js
M htdocs/includes/ckeditor/lang/cs.js
M htdocs/includes/ckeditor/lang/cy.js
M htdocs/includes/ckeditor/lang/da.js
M htdocs/includes/ckeditor/lang/de.js
M htdocs/includes/ckeditor/lang/el.js
M htdocs/includes/ckeditor/lang/en-au.js
M htdocs/includes/ckeditor/lang/en-ca.js
M htdocs/includes/ckeditor/lang/en-gb.js
M htdocs/includes/ckeditor/lang/en.js
M htdocs/includes/ckeditor/lang/eo.js
M htdocs/includes/ckeditor/lang/es.js
M htdocs/includes/ckeditor/lang/et.js
M htdocs/includes/ckeditor/lang/eu.js
M htdocs/includes/ckeditor/lang/fa.js
M htdocs/includes/ckeditor/lang/fi.js
M htdocs/includes/ckeditor/lang/fo.js
M htdocs/includes/ckeditor/lang/fr-ca.js
M htdocs/includes/ckeditor/lang/fr.js
M htdocs/includes/ckeditor/lang/gl.js
M htdocs/includes/ckeditor/lang/gu.js
M htdocs/includes/ckeditor/lang/he.js
M htdocs/includes/ckeditor/lang/hi.js
M htdocs/includes/ckeditor/lang/hr.js
M htdocs/includes/ckeditor/lang/hu.js
M htdocs/includes/ckeditor/lang/id.js
M htdocs/includes/ckeditor/lang/is.js
M htdocs/includes/ckeditor/lang/it.js
M htdocs/includes/ckeditor/lang/ja.js
M htdocs/includes/ckeditor/lang/ka.js
M htdocs/includes/ckeditor/lang/km.js
M htdocs/includes/ckeditor/lang/ko.js
M htdocs/includes/ckeditor/lang/lt.js
M htdocs/includes/ckeditor/lang/lv.js
M htdocs/includes/ckeditor/lang/mk.js
M htdocs/includes/ckeditor/lang/mn.js
M htdocs/includes/ckeditor/lang/ms.js
M htdocs/includes/ckeditor/lang/nb.js
M htdocs/includes/ckeditor/lang/nl.js
M htdocs/includes/ckeditor/lang/no.js
M htdocs/includes/ckeditor/lang/pl.js
M htdocs/includes/ckeditor/lang/pt-br.js
M htdocs/includes/ckeditor/lang/pt.js
M htdocs/includes/ckeditor/lang/ro.js
M htdocs/includes/ckeditor/lang/ru.js
M htdocs/includes/ckeditor/lang/sk.js
M htdocs/includes/ckeditor/lang/sl.js
M htdocs/includes/ckeditor/lang/sr-latn.js
M htdocs/includes/ckeditor/lang/sr.js
M htdocs/includes/ckeditor/lang/sv.js
M htdocs/includes/ckeditor/lang/th.js
M htdocs/includes/ckeditor/lang/tr.js
M htdocs/includes/ckeditor/lang/ug.js
M htdocs/includes/ckeditor/lang/uk.js
M htdocs/includes/ckeditor/lang/vi.js
M htdocs/includes/ckeditor/lang/zh-cn.js
M htdocs/includes/ckeditor/lang/zh.js
M htdocs/includes/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/cs.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/cy.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/da.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/de.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/el.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/en.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/eo.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/fa.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/fi.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/fr.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/gu.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/he.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/it.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/mk.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/nb.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/nl.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/no.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/pt-br.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/ro.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/tr.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/ug.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/vi.js
M htdocs/includes/ckeditor/plugins/a11yhelp/lang/zh-cn.js
M htdocs/includes/ckeditor/plugins/about/dialogs/about.js
M htdocs/includes/ckeditor/plugins/adobeair/plugin.js
M htdocs/includes/ckeditor/plugins/ajax/plugin.js
M htdocs/includes/ckeditor/plugins/autogrow/plugin.js
M htdocs/includes/ckeditor/plugins/bbcode/plugin.js
M htdocs/includes/ckeditor/plugins/clipboard/dialogs/paste.js
M htdocs/includes/ckeditor/plugins/colordialog/dialogs/colordialog.js
M htdocs/includes/ckeditor/plugins/devtools/lang/bg.js
M htdocs/includes/ckeditor/plugins/devtools/lang/cs.js
M htdocs/includes/ckeditor/plugins/devtools/lang/cy.js
M htdocs/includes/ckeditor/plugins/devtools/lang/da.js
M htdocs/includes/ckeditor/plugins/devtools/lang/de.js
M htdocs/includes/ckeditor/plugins/devtools/lang/el.js
M htdocs/includes/ckeditor/plugins/devtools/lang/en.js
M htdocs/includes/ckeditor/plugins/devtools/lang/eo.js
M htdocs/includes/ckeditor/plugins/devtools/lang/et.js
M htdocs/includes/ckeditor/plugins/devtools/lang/fa.js
M htdocs/includes/ckeditor/plugins/devtools/lang/fi.js
M htdocs/includes/ckeditor/plugins/devtools/lang/fr.js
M htdocs/includes/ckeditor/plugins/devtools/lang/gu.js
M htdocs/includes/ckeditor/plugins/devtools/lang/he.js
M htdocs/includes/ckeditor/plugins/devtools/lang/hr.js
M htdocs/includes/ckeditor/plugins/devtools/lang/it.js
M htdocs/includes/ckeditor/plugins/devtools/lang/nb.js
M htdocs/includes/ckeditor/plugins/devtools/lang/nl.js
M htdocs/includes/ckeditor/plugins/devtools/lang/no.js
M htdocs/includes/ckeditor/plugins/devtools/lang/pl.js
M htdocs/includes/ckeditor/plugins/devtools/lang/pt-br.js
M htdocs/includes/ckeditor/plugins/devtools/lang/tr.js
M htdocs/includes/ckeditor/plugins/devtools/lang/ug.js
M htdocs/includes/ckeditor/plugins/devtools/lang/uk.js
M htdocs/includes/ckeditor/plugins/devtools/lang/vi.js
M htdocs/includes/ckeditor/plugins/devtools/lang/zh-cn.js
M htdocs/includes/ckeditor/plugins/devtools/plugin.js
M htdocs/includes/ckeditor/plugins/dialog/dialogDefinition.js
M htdocs/includes/ckeditor/plugins/div/dialogs/div.js
M htdocs/includes/ckeditor/plugins/docprops/dialogs/docprops.js
M htdocs/includes/ckeditor/plugins/docprops/plugin.js
M htdocs/includes/ckeditor/plugins/find/dialogs/find.js
M htdocs/includes/ckeditor/plugins/flash/dialogs/flash.js
M htdocs/includes/ckeditor/plugins/forms/dialogs/button.js
M htdocs/includes/ckeditor/plugins/forms/dialogs/checkbox.js
M htdocs/includes/ckeditor/plugins/forms/dialogs/form.js
M htdocs/includes/ckeditor/plugins/forms/dialogs/hiddenfield.js
M htdocs/includes/ckeditor/plugins/forms/dialogs/radio.js
M htdocs/includes/ckeditor/plugins/forms/dialogs/select.js
M htdocs/includes/ckeditor/plugins/forms/dialogs/textarea.js
M htdocs/includes/ckeditor/plugins/forms/dialogs/textfield.js
M htdocs/includes/ckeditor/plugins/iframe/dialogs/iframe.js
M htdocs/includes/ckeditor/plugins/iframedialog/plugin.js
M htdocs/includes/ckeditor/plugins/image/dialogs/image.js
M htdocs/includes/ckeditor/plugins/link/dialogs/anchor.js
M htdocs/includes/ckeditor/plugins/link/dialogs/link.js
M htdocs/includes/ckeditor/plugins/liststyle/dialogs/liststyle.js
M htdocs/includes/ckeditor/plugins/pastefromword/filter/default.js
M htdocs/includes/ckeditor/plugins/pastetext/dialogs/pastetext.js
M htdocs/includes/ckeditor/plugins/placeholder/dialogs/placeholder.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/bg.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/cs.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/cy.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/da.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/de.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/el.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/en.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/eo.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/et.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/fa.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/fi.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/fr.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/he.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/hr.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/it.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/nb.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/nl.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/no.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/pl.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/pt-br.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/tr.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/ug.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/uk.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/vi.js
M htdocs/includes/ckeditor/plugins/placeholder/lang/zh-cn.js
M htdocs/includes/ckeditor/plugins/placeholder/plugin.js
M htdocs/includes/ckeditor/plugins/preview/preview.html
M htdocs/includes/ckeditor/plugins/scayt/dialogs/options.js
M htdocs/includes/ckeditor/plugins/scayt/dialogs/toolbar.css
M htdocs/includes/ckeditor/plugins/smiley/dialogs/smiley.js
M htdocs/includes/ckeditor/plugins/specialchar/dialogs/specialchar.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/cs.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/cy.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/de.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/el.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/en.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/eo.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/et.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/fa.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/fi.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/fr.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/he.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/hr.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/it.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/nb.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/nl.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/no.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/pt-br.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/tr.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/ug.js
M htdocs/includes/ckeditor/plugins/specialchar/lang/zh-cn.js
M htdocs/includes/ckeditor/plugins/styles/styles/default.js
M htdocs/includes/ckeditor/plugins/stylesheetparser/plugin.js
M htdocs/includes/ckeditor/plugins/table/dialogs/table.js
M htdocs/includes/ckeditor/plugins/tableresize/plugin.js
M htdocs/includes/ckeditor/plugins/tabletools/dialogs/tableCell.js
M htdocs/includes/ckeditor/plugins/templates/dialogs/templates.js
M htdocs/includes/ckeditor/plugins/templates/templates/default.js
M htdocs/includes/ckeditor/plugins/uicolor/dialogs/uicolor.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/bg.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/cs.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/cy.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/da.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/de.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/el.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/en.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/eo.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/et.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/fa.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/fi.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/fr.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/he.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/hr.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/it.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/mk.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/nb.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/nl.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/no.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/pl.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/pt-br.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/tr.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/ug.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/uk.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/vi.js
M htdocs/includes/ckeditor/plugins/uicolor/lang/zh-cn.js
M htdocs/includes/ckeditor/plugins/uicolor/plugin.js
M htdocs/includes/ckeditor/plugins/uicolor/yui/assets/yui.css
M htdocs/includes/ckeditor/plugins/uicolor/yui/yui.js
M htdocs/includes/ckeditor/plugins/wsc/dialogs/ciframe.html
M htdocs/includes/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
M htdocs/includes/ckeditor/plugins/wsc/dialogs/wsc.css
M htdocs/includes/ckeditor/plugins/wsc/dialogs/wsc.js
M htdocs/includes/ckeditor/plugins/xml/plugin.js
M htdocs/includes/ckeditor/skins/kama/dialog.css
M htdocs/includes/ckeditor/skins/kama/editor.css
M htdocs/includes/ckeditor/skins/kama/skin.js
M htdocs/includes/ckeditor/skins/kama/templates.css
M htdocs/includes/ckeditor/skins/office2003/dialog.css
M htdocs/includes/ckeditor/skins/office2003/editor.css
M htdocs/includes/ckeditor/skins/office2003/skin.js
M htdocs/includes/ckeditor/skins/office2003/templates.css
M htdocs/includes/ckeditor/skins/v2/dialog.css
M htdocs/includes/ckeditor/skins/v2/editor.css
M htdocs/includes/ckeditor/skins/v2/skin.js
M htdocs/includes/ckeditor/skins/v2/templates.css
M htdocs/includes/ckeditor/themes/default/theme.js
M htdocs/includes/jquery/js/jquery-latest.min.js
M htdocs/includes/jquery/plugins/jpicker/Example.html
M htdocs/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css
M htdocs/includes/jquery/plugins/jpicker/jPicker.css
M htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.async.js
M htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.css
M htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.sortable.js
M htdocs/includes/jquery/plugins/layout/jquery.layout-latest.js
M htdocs/install/mysql/tables/llx_actioncomm.sql
M htdocs/install/mysql/tables/llx_cronjob.sql
M htdocs/langs/en_US/admin.lang
M htdocs/product/ajax/products.php
M htdocs/product/class/html.formproduct.class.php
M htdocs/product/class/product.class.php
M htdocs/product/price.php
M htdocs/theme/bureau2crea/style.css.php
M htdocs/theme/eldy/style.css.php
M htdocs/user/logout.php
M htdocs/viewimage.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: 109d1a71cb72d0abbb2a97b463a0889d888a3d06
https://github.com/Dolibarr/dolibarr/commit/109d1a71cb72d0abbb2a97b463a0889d888a3d06
Author: Maxime Kohlhaas <address@hidden>
Date: 2013-06-25 (Tue, 25 Jun 2013)
Changed paths:
M htdocs/install/mysql/tables/llx_cronjob.sql
Log Message:
-----------
Merge
Commit: b22b604d02405e868f40c108317cce3c7fa54f55
https://github.com/Dolibarr/dolibarr/commit/b22b604d02405e868f40c108317cce3c7fa54f55
Author: Maxime Kohlhaas <address@hidden>
Date: 2013-06-25 (Tue, 25 Jun 2013)
Changed paths:
M htdocs/install/mysql/migration/3.4.0-3.5.0.sql
M htdocs/install/mysql/tables/llx_user.sql
M htdocs/user/class/user.class.php
M htdocs/user/fiche.php
Log Message:
-----------
Accountancy code on user object in prevision of the complete accountancy
module
Commit: 2a67d5230dc068c721df71cffb3027af17556547
https://github.com/Dolibarr/dolibarr/commit/2a67d5230dc068c721df71cffb3027af17556547
Author: Maxime Kohlhaas <address@hidden>
Date: 2013-06-25 (Tue, 25 Jun 2013)
Changed paths:
M ChangeLog
M htdocs/core/lib/functions.lib.php
M htdocs/langs/en_US/paybox.lang
M htdocs/langs/en_US/paypal.lang
M htdocs/langs/fr_FR/paybox.lang
M htdocs/langs/fr_FR/paypal.lang
M htdocs/paybox/admin/paybox.php
M htdocs/paypal/admin/paypal.php
M htdocs/public/paybox/paymentko.php
M htdocs/public/paybox/paymentok.php
M htdocs/public/paypal/paymentko.php
M htdocs/public/paypal/paymentok.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: 76870622e46ebaa5f3e74adb9e12aaee62d37551
https://github.com/Dolibarr/dolibarr/commit/76870622e46ebaa5f3e74adb9e12aaee62d37551
Author: Maxime Kohlhaas <address@hidden>
Date: 2013-06-25 (Tue, 25 Jun 2013)
Changed paths:
M htdocs/compta/stats/cabyprodserv.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/paybox/admin/paybox.php
M htdocs/paypal/admin/paypal.php
Log Message:
-----------
Add turnover report by product / serv
Commit: 58bdac2dcda6a0736942a276f9481bb0cba01ff7
https://github.com/Dolibarr/dolibarr/commit/58bdac2dcda6a0736942a276f9481bb0cba01ff7
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-26 (Wed, 26 Jun 2013)
Changed paths:
M htdocs/compta/stats/cabyprodserv.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/install/mysql/migration/3.4.0-3.5.0.sql
M htdocs/install/mysql/tables/llx_cronjob.sql
M htdocs/install/mysql/tables/llx_user.sql
M htdocs/societe/societe.php
M htdocs/user/class/user.class.php
M htdocs/user/fiche.php
Log Message:
-----------
Merge pull request #1066 from atm-maxime/develop
Add search on siren (idprof1)
Compare:
https://github.com/Dolibarr/dolibarr/compare/6a83345f8911...58bdac2dcda6
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] 8bc689: Merge modif,
Laurent Destailleur <=