[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 91caea: Code was corrupted with very
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 91caea: Code was corrupted with very bad commits. I restor... |
|
Date: |
Fri, 25 Mar 2016 08:02:36 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 91caea5707b50ed2dc882fae810895b21a571a27
https://github.com/Dolibarr/dolibarr/commit/91caea5707b50ed2dc882fae810895b21a571a27
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-25 (Fri, 25 Mar 2016)
Changed paths:
M ChangeLog
M dev/skeletons/skeleton_card.php
M dev/skeletons/skeleton_list.php
M htdocs/accountancy/admin/account.php
M htdocs/accountancy/admin/fiscalyear_card.php
M htdocs/accountancy/bookkeeping/balance.php
M htdocs/accountancy/bookkeeping/card.php
M htdocs/accountancy/bookkeeping/list.php
M htdocs/accountancy/bookkeeping/listbyyear.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/accountancy/journal/sellsjournal.php
M htdocs/accountancy/supplier/lines.php
M htdocs/adherents/admin/adherent.php
M htdocs/adherents/admin/public.php
M htdocs/adherents/canvas/actions_adherentcard_common.class.php
M htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
M htdocs/adherents/card.php
M htdocs/adherents/card_subscriptions.php
M htdocs/adherents/cotisations.php
M htdocs/adherents/fiche_subscription.php
M htdocs/adherents/list.php
M htdocs/adherents/type.php
M htdocs/admin/boxes.php
M htdocs/admin/clicktodial.php
M htdocs/admin/delais.php
M htdocs/admin/dict.php
M htdocs/admin/facture.php
M htdocs/admin/ihm.php
M htdocs/admin/mails.php
M htdocs/admin/menus/index.php
M htdocs/admin/multicurrency.php
M htdocs/admin/pdf.php
M htdocs/admin/propal.php
M htdocs/admin/proxy.php
M htdocs/admin/sms.php
M htdocs/admin/stock.php
M htdocs/admin/tools/listevents.php
M htdocs/admin/tools/listsessions.php
M htdocs/admin/tools/purge.php
M htdocs/admin/websites.php
M htdocs/cashdesk/admin/cashdesk.php
M htdocs/cashdesk/tpl/facturation1.tpl.php
M htdocs/categories/categorie.php
M htdocs/categories/photos.php
M htdocs/categories/viewcat.php
M htdocs/comm/action/card.php
M htdocs/comm/action/document.php
M htdocs/comm/action/listactions.php
M htdocs/comm/action/pertype.php
M htdocs/comm/action/peruser.php
M htdocs/comm/address.php
M htdocs/comm/card.php
M htdocs/comm/mailing/card.php
M htdocs/comm/mailing/cibles.php
M htdocs/comm/propal.php
M htdocs/comm/propal/apercu.php
M htdocs/comm/propal/contact.php
M htdocs/comm/propal/document.php
M htdocs/comm/propal/note.php
M htdocs/comm/remx.php
M htdocs/commande/apercu.php
M htdocs/commande/card.php
M htdocs/commande/contact.php
M htdocs/commande/document.php
M htdocs/commande/list.php
M htdocs/commande/note.php
M htdocs/commande/orderstoinvoice.php
M htdocs/compta/bank/account.php
M htdocs/compta/bank/annuel.php
M htdocs/compta/bank/card.php
M htdocs/compta/bank/document.php
M htdocs/compta/bank/graph.php
M htdocs/compta/bank/ligne.php
M htdocs/compta/bank/releve.php
M htdocs/compta/bank/search.php
M htdocs/compta/bank/treso.php
M htdocs/compta/bank/virement.php
M htdocs/compta/deplacement/card.php
M htdocs/compta/deplacement/document.php
M htdocs/compta/deplacement/list.php
M htdocs/compta/facture.php
M htdocs/compta/facture/apercu.php
M htdocs/compta/facture/contact.php
M htdocs/compta/facture/document.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/compta/facture/list.php
M htdocs/compta/facture/note.php
M htdocs/compta/facture/prelevement.php
M htdocs/compta/journal/purchasesjournal.php
M htdocs/compta/journal/sellsjournal.php
M htdocs/compta/localtax/card.php
M htdocs/compta/localtax/clients.php
M htdocs/compta/localtax/index.php
M htdocs/compta/localtax/quadri_detail.php
M htdocs/compta/paiement.php
M htdocs/compta/paiement/card.php
M htdocs/compta/paiement/cheque/card.php
M htdocs/compta/paiement/cheque/class/remisecheque.class.php
M htdocs/compta/paiement/cheque/list.php
M htdocs/compta/paiement/list.php
M htdocs/compta/paiement_charge.php
M htdocs/compta/payment_sc/card.php
M htdocs/compta/prelevement/card.php
M htdocs/compta/prelevement/ligne.php
M htdocs/compta/prelevement/list.php
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/salaries/card.php
M htdocs/compta/salaries/document.php
M htdocs/compta/salaries/index.php
M htdocs/compta/sociales/charges.php
M htdocs/compta/sociales/document.php
M htdocs/compta/sociales/index.php
M htdocs/compta/stats/cabyprodserv.php
M htdocs/compta/stats/cabyuser.php
M htdocs/compta/stats/casoc.php
M htdocs/compta/tva/card.php
M htdocs/compta/tva/clients.php
M htdocs/compta/tva/index.php
M htdocs/compta/tva/quadri_detail.php
M htdocs/compta/tva/quarter_report.php
M htdocs/compta/tva/reglement.php
M htdocs/contact/canvas/actions_contactcard_common.class.php
M htdocs/contact/canvas/default/actions_contactcard_default.class.php
M htdocs/contact/card.php
M htdocs/contact/perso.php
M htdocs/contrat/card.php
M htdocs/contrat/contact.php
M htdocs/contrat/document.php
M htdocs/contrat/list.php
M htdocs/contrat/note.php
M htdocs/contrat/services.php
M htdocs/core/ajax/ajaxdirpreview.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/lib/admin.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/lib/project.lib.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
M htdocs/core/modules/commande/mod_commande_saphir.php
M htdocs/core/modules/contract/mod_contract_magre.php
M htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
M htdocs/core/modules/expedition/mod_expedition_ribera.php
M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
M htdocs/core/modules/facture/mod_facture_mercure.php
M htdocs/core/modules/fichinter/mod_arctic.php
M htdocs/core/modules/livraison/mod_livraison_saphir.php
M htdocs/core/modules/mailings/fraise.modules.php
M htdocs/core/modules/modExpenseReport.class.php
M htdocs/core/modules/payment/mod_payment_ant.php
M htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
M htdocs/core/modules/project/mod_project_universal.php
M htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
M htdocs/core/modules/project/task/mod_task_universal.php
M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
M htdocs/core/modules/propale/mod_propale_saphir.php
M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
M htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
M htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
M
htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
M htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
M htdocs/core/tpl/document_actions_post_headers.tpl.php
M htdocs/core/tpl/notes.tpl.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/core/tpl/resource_add.tpl.php
M htdocs/core/tpl/resource_view.tpl.php
M htdocs/cron/card.php
M htdocs/cron/list.php
M htdocs/don/card.php
M htdocs/don/document.php
M htdocs/don/list.php
M htdocs/don/payment/card.php
M htdocs/don/payment/payment.php
M htdocs/ecm/docdir.php
M htdocs/ecm/docfile.php
M htdocs/ecm/docmine.php
M htdocs/ecm/docother.php
M htdocs/ecm/index.php
M htdocs/ecm/index_auto.php
M htdocs/expedition/card.php
M htdocs/expedition/contact.php
M htdocs/expedition/list.php
M htdocs/expedition/note.php
M htdocs/expedition/shipment.php
M htdocs/expensereport/card.php
M htdocs/expensereport/document.php
M htdocs/expensereport/list.php
M htdocs/expensereport/payment/card.php
M htdocs/expensereport/payment/payment.php
M htdocs/expensereport/synchro_compta.php
M htdocs/exports/export.php
M htdocs/fichinter/apercu.php
M htdocs/fichinter/card.php
M htdocs/fichinter/contact.php
M htdocs/fichinter/document.php
M htdocs/fichinter/list.php
M htdocs/fichinter/note.php
M htdocs/fourn/card.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/commande/contact.php
M htdocs/fourn/commande/dispatch.php
M htdocs/fourn/commande/document.php
M htdocs/fourn/commande/history.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/commande/note.php
M htdocs/fourn/commande/orderstoinvoice.php
M htdocs/fourn/facture/card.php
M htdocs/fourn/facture/contact.php
M htdocs/fourn/facture/document.php
M htdocs/fourn/facture/impayees.php
M htdocs/fourn/facture/list.php
M htdocs/fourn/facture/note.php
M htdocs/fourn/facture/paiement.php
M htdocs/fourn/paiement/card.php
M htdocs/ftp/admin/ftpclient.php
M htdocs/ftp/index.php
M htdocs/holiday/card.php
M htdocs/holiday/document.php
M htdocs/holiday/list.php
M htdocs/hrm/establishment/card.php
M htdocs/imports/import.php
M htdocs/includes/odtphp/Segment.php
M htdocs/includes/odtphp/odf.php
M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
M htdocs/langs/en_US/accountancy.lang
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/main.lang
M htdocs/livraison/card.php
M htdocs/loan/card.php
M htdocs/loan/document.php
M htdocs/loan/note.php
M htdocs/loan/payment/card.php
M htdocs/loan/payment/payment.php
M htdocs/margin/agentMargins.php
M htdocs/margin/checkMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
M htdocs/opensurvey/card.php
M htdocs/opensurvey/list.php
M htdocs/opensurvey/results.php
M htdocs/opensurvey/wizard/create_survey.php
M htdocs/paypal/admin/paypal.php
M htdocs/product/admin/product.php
M htdocs/product/canvas/product/actions_card_product.class.php
M htdocs/product/canvas/product/tpl/list.tpl.php
M htdocs/product/canvas/service/actions_card_service.class.php
M htdocs/product/canvas/service/tpl/list.tpl.php
M htdocs/product/card.php
M htdocs/product/composition/card.php
M htdocs/product/fournisseurs.php
M htdocs/product/list.php
M htdocs/product/price.php
M htdocs/product/reassort.php
M htdocs/product/reassortlot.php
M htdocs/product/stock/card.php
M htdocs/product/stock/fiche-valo.php
M htdocs/product/stock/list.php
M htdocs/product/stock/mouvement.php
M htdocs/product/stock/product.php
M htdocs/product/stock/replenish.php
M htdocs/product/stock/replenishorders.php
M htdocs/product/stock/tpl/stockcorrection.tpl.php
M htdocs/product/stock/tpl/stocktransfer.tpl.php
M htdocs/projet/activity/perday.php
M htdocs/projet/activity/perweek.php
M htdocs/projet/admin/project.php
M htdocs/projet/card.php
M htdocs/projet/contact.php
M htdocs/projet/document.php
M htdocs/projet/element.php
M htdocs/projet/ganttview.php
M htdocs/projet/list.php
M htdocs/projet/note.php
M htdocs/projet/tasks.php
M htdocs/projet/tasks/contact.php
M htdocs/projet/tasks/document.php
M htdocs/projet/tasks/list.php
M htdocs/projet/tasks/note.php
M htdocs/projet/tasks/task.php
M htdocs/projet/tasks/time.php
M htdocs/public/members/new.php
M htdocs/public/test/test_arrays.php
M htdocs/public/test/test_forms.php
M htdocs/resource/card.php
M htdocs/resource/element_resource.php
M htdocs/resource/list.php
M htdocs/societe/canvas/actions_card_common.class.php
M htdocs/societe/canvas/company/actions_card_company.class.php
M htdocs/societe/canvas/individual/actions_card_individual.class.php
M htdocs/societe/consumption.php
M htdocs/societe/list.php
M htdocs/societe/price.php
M htdocs/societe/rib.php
M htdocs/societe/soc.php
M htdocs/supplier_proposal/card.php
M htdocs/supplier_proposal/document.php
M htdocs/supplier_proposal/note.php
M htdocs/user/card.php
M htdocs/user/group/card.php
M htdocs/user/group/ldap.php
M htdocs/user/group/perms.php
M htdocs/user/hierarchy.php
M htdocs/user/index.php
M scripts/accountancy/export-thirdpartyaccount.php
Log Message:
-----------
Code was corrupted with very bad commits. I restore files manually.
Commit: 642d7473a812043bf0e403afa55f6a9ef13ca5c9
https://github.com/Dolibarr/dolibarr/commit/642d7473a812043bf0e403afa55f6a9ef13ca5c9
Author: aspangaro <address@hidden>
Date: 2016-03-25 (Fri, 25 Mar 2016)
Changed paths:
M htdocs/don/card.php
Log Message:
-----------
FIX: Donation || Don't show project icon if fk_project is empty
Commit: e30d717e007ef0c507e9be662308e9355775e1c2
https://github.com/Dolibarr/dolibarr/commit/e30d717e007ef0c507e9be662308e9355775e1c2
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-25 (Fri, 25 Mar 2016)
Changed paths:
M htdocs/compta/localtax/index.php
M htdocs/compta/tva/index.php
Log Message:
-----------
Uniformize look
Commit: 5cd5a3a5fbf8f055166950d90784da98e46d01a7
https://github.com/Dolibarr/dolibarr/commit/5cd5a3a5fbf8f055166950d90784da98e46d01a7
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-25 (Fri, 25 Mar 2016)
Changed paths:
M htdocs/core/modules/propale/mod_propale_saphir.php
Log Message:
-----------
Fix regression
Commit: 88e5616622557375c5d42238e4c29296eaf8bc65
https://github.com/Dolibarr/dolibarr/commit/88e5616622557375c5d42238e4c29296eaf8bc65
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-25 (Fri, 25 Mar 2016)
Changed paths:
M htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
M htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
M htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
M htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
M
htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
Log Message:
-----------
Prepare code to be able to download ODT templates
Commit: bb8e53deeadd8475a765063c5b8ab7dee5ef1336
https://github.com/Dolibarr/dolibarr/commit/bb8e53deeadd8475a765063c5b8ab7dee5ef1336
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-25 (Fri, 25 Mar 2016)
Changed paths:
M htdocs/core/modules/propale/mod_propale_saphir.php
Log Message:
-----------
Revert "Fix regression"
This reverts commit 5cd5a3a5fbf8f055166950d90784da98e46d01a7.
Commit: 80e10158a5e6bf65e58df7e672ff3a8b3a705f3d
https://github.com/Dolibarr/dolibarr/commit/80e10158a5e6bf65e58df7e672ff3a8b3a705f3d
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-25 (Fri, 25 Mar 2016)
Changed paths:
M htdocs/includes/odtphp/Segment.php
M htdocs/includes/odtphp/odf.php
Log Message:
-----------
Add code comment
Commit: a68b704daf563e94c2bbc36d420ffb4694974365
https://github.com/Dolibarr/dolibarr/commit/a68b704daf563e94c2bbc36d420ffb4694974365
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-25 (Fri, 25 Mar 2016)
Changed paths:
M htdocs/includes/odtphp/Segment.php
Log Message:
-----------
FIX Must not return error when vars does not exists
Commit: 3dc991974c92dd495bcf9162865f15743b2bf1c2
https://github.com/Dolibarr/dolibarr/commit/3dc991974c92dd495bcf9162865f15743b2bf1c2
Author: aspangaro <address@hidden>
Date: 2016-03-25 (Fri, 25 Mar 2016)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
Log Message:
-----------
FIX: Accountancy Bank journal Fix some problem with other module
Commit: f8f55e05d04348a742f1e62494b3a5e23e96e549
https://github.com/Dolibarr/dolibarr/commit/f8f55e05d04348a742f1e62494b3a5e23e96e549
Author: aspangaro <address@hidden>
Date: 2016-03-25 (Fri, 25 Mar 2016)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
NEW: Accountancy Add a way to initialize chart of accounts
Commit: 1d780e7e7759b6b3bb698a56eb4d8982eb248a6c
https://github.com/Dolibarr/dolibarr/commit/1d780e7e7759b6b3bb698a56eb4d8982eb248a6c
Author: aspangaro <address@hidden>
Date: 2016-03-25 (Fri, 25 Mar 2016)
Changed paths:
M htdocs/admin/dict.php
M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
Log Message:
-----------
NEW: Accountancy - Add category to manage the display of the income
statement and the balance sheet
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
Commit: 05df3408f2551a14082b1050b9c6ca59acecc09a
https://github.com/Dolibarr/dolibarr/commit/05df3408f2551a14082b1050b9c6ca59acecc09a
Author: aspangaro <address@hidden>
Date: 2016-03-25 (Fri, 25 Mar 2016)
Changed paths:
M htdocs/admin/dict.php
M htdocs/langs/en_US/accountancy.lang
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Debug works
Commit: aa9a39cab569536a93a361a49b098349d581b83c
https://github.com/Dolibarr/dolibarr/commit/aa9a39cab569536a93a361a49b098349d581b83c
Author: Juanjo Menent <address@hidden>
Date: 2016-03-25 (Fri, 25 Mar 2016)
Changed paths:
M htdocs/compta/paiement/cheque/class/remisecheque.class.php
M htdocs/core/class/html.formfile.class.php
Log Message:
-----------
NEW #3510 : Standardize module
Commit: 61bc8fc9ef5d70dfb97852b64e5952daa7abc8f6
https://github.com/Dolibarr/dolibarr/commit/61bc8fc9ef5d70dfb97852b64e5952daa7abc8f6
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-25 (Fri, 25 Mar 2016)
Changed paths:
M htdocs/compta/localtax/card.php
M htdocs/compta/tva/card.php
M htdocs/compta/tva/reglement.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
NEW Can edit value date of a vat payment after recording it.
Conflicts:
htdocs/compta/localtax/card.php
htdocs/core/class/html.form.class.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/a2e9832c8de7...61bc8fc9ef5d
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] 91caea: Code was corrupted with very bad commits. I restor...,
Laurent Destailleur <=