[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] d92665: FIX: Accountancy - Format EBP
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] d92665: FIX: Accountancy - Format EBP import |
Date: |
Thu, 14 Mar 2019 06:20:54 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: d92665753495b317e5b8b05addd35a1f82c316be
https://github.com/Dolibarr/dolibarr/commit/d92665753495b317e5b8b05addd35a1f82c316be
Author: Alexandre SPANGARO <address@hidden>
Date: 2019-03-08 (Fri, 08 Mar 2019)
Changed paths:
A dev/resources/iso-normes/Accountancy-format_Ebp_txt.pdf
M htdocs/accountancy/class/accountancyexport.class.php
Log Message:
-----------
FIX: Accountancy - Format EBP import
Add doc
Commit: 49f72b6a9aed82143556677c04aca494e078fb32
https://github.com/Dolibarr/dolibarr/commit/49f72b6a9aed82143556677c04aca494e078fb32
Author: Alexandre SPANGARO <address@hidden>
Date: 2019-03-09 (Sat, 09 Mar 2019)
Changed paths:
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/subscription.php
M htdocs/admin/agenda_reminder.php
M htdocs/admin/modules.php
M htdocs/admin/system/filecheck.php
M htdocs/api/class/api.class.php
M htdocs/cashdesk/class/Facturation.class.php
M htdocs/cashdesk/index.php
M htdocs/cashdesk/tpl/liste_articles.tpl.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/card.php
M htdocs/comm/remise.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/class/paymentterm.class.php
M htdocs/compta/localtax/index.php
M htdocs/compta/paiement.php
M htdocs/compta/paiement/class/paiement.class.php
M htdocs/compta/sociales/class/chargesociales.class.php
M htdocs/compta/tva/index.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/boxes/box_actions.php
M htdocs/core/class/commondocgenerator.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/discount.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/stats.class.php
M htdocs/core/db/pgsql.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/security.lib.php
M htdocs/core/login/functions_dolibarr.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/facture/mod_facture_mars.php
M htdocs/core/modules/facture/mod_facture_terre.php
M htdocs/core/modules/mailings/modules_mailings.php
M htdocs/core/modules/mailings/xinputfile.modules.php
M htdocs/core/modules/modAdherent.class.php
M htdocs/core/modules/modAgenda.class.php
M htdocs/core/modules/modCommande.class.php
M htdocs/core/modules/modFacture.class.php
M htdocs/core/modules/modProjet.class.php
M htdocs/core/modules/modPropale.class.php
M htdocs/core/modules/modSociete.class.php
M htdocs/core/modules/modStock.class.php
M htdocs/core/modules/modUser.class.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/core/tpl/objectline_view.tpl.php
M htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
M htdocs/document.php
M htdocs/expedition/class/expedition.class.php
M htdocs/exports/class/export.class.php
M htdocs/exports/export.php
M htdocs/filefunc.inc.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/class/fournisseur.product.class.php
M htdocs/fourn/commande/dispatch.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/facture/card.php
M htdocs/fourn/facture/list.php
M htdocs/fourn/facture/paiement.php
M htdocs/fourn/recap-fourn.php
M htdocs/imports/import.php
M htdocs/install/inc.php
M htdocs/langs/en_ZA/main.lang
M htdocs/margin/tabs/productMargins.php
M htdocs/product/index.php
M htdocs/product/stats/facture_fournisseur.php
M htdocs/product/stock/card.php
M htdocs/product/stock/class/entrepot.class.php
M htdocs/product/stock/info.php
M htdocs/product/stock/mouvement.php
M htdocs/societe/class/societe.class.php
M htdocs/supplier_proposal/card.php
M htdocs/theme/eldy/style.css.php
M htdocs/user/card.php
M htdocs/user/class/api_users.class.php
M htdocs/user/class/user.class.php
M htdocs/variants/combinations.php
M htdocs/viewimage.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/8.0' into 8.0_EBP_export-TXT
Commit: 15cc21b89fc86e34aad72692e92e78956667ba59
https://github.com/Dolibarr/dolibarr/commit/15cc21b89fc86e34aad72692e92e78956667ba59
Author: Laurent Destailleur <address@hidden>
Date: 2019-03-11 (Mon, 11 Mar 2019)
Changed paths:
A dev/resources/iso-normes/Accountancy-format_Ebp_txt.pdf
M htdocs/accountancy/class/accountancyexport.class.php
Log Message:
-----------
Merge pull request #10783 from aspangaro/8.0_EBP_export-TXT
FIX: Accountancy - Format EBP import
Commit: 94c58072d74cc7f671448dfd92c8ba587144228d
https://github.com/Dolibarr/dolibarr/commit/94c58072d74cc7f671448dfd92c8ba587144228d
Author: Regis Houssin <address@hidden>
Date: 2019-03-12 (Tue, 12 Mar 2019)
Changed paths:
M htdocs/admin/facture.php
M htdocs/admin/propal.php
Log Message:
-----------
FIX possibility to set up payment mode when invoice module is disabled
Commit: 259fa0ac812b5a2bedd9d29116b239d49728e824
https://github.com/Dolibarr/dolibarr/commit/259fa0ac812b5a2bedd9d29116b239d49728e824
Author: Regis Houssin <address@hidden>
Date: 2019-03-12 (Tue, 12 Mar 2019)
Changed paths:
M htdocs/admin/propal.php
Log Message:
-----------
FIX check only if invoice module is enabled (bank is check after)
Commit: 47057b431d427443cd5f59f451198d2c00ea561b
https://github.com/Dolibarr/dolibarr/commit/47057b431d427443cd5f59f451198d2c00ea561b
Author: Regis Houssin <address@hidden>
Date: 2019-03-12 (Tue, 12 Mar 2019)
Changed paths:
M htdocs/admin/propal.php
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
FIX translation
Commit: 7b8b6bb02f85883ee498bca02515b96a2633a142
https://github.com/Dolibarr/dolibarr/commit/7b8b6bb02f85883ee498bca02515b96a2633a142
Author: Laurent Destailleur <address@hidden>
Date: 2019-03-14 (Thu, 14 Mar 2019)
Changed paths:
M htdocs/admin/facture.php
M htdocs/admin/propal.php
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Merge pull request #10804 from hregis/9.0_merge
FIX possibility to set up payment mode when invoice module is disabled
Commit: d7735ff272606e9f34e425283dc9643b7797b608
https://github.com/Dolibarr/dolibarr/commit/d7735ff272606e9f34e425283dc9643b7797b608
Author: Laurent Destailleur <address@hidden>
Date: 2019-03-14 (Thu, 14 Mar 2019)
Changed paths:
M htdocs/expedition/card.php
Log Message:
-----------
FIX #10822
Commit: b65c79104351f34b4cd2c9e4b7edfea7d1c3a37f
https://github.com/Dolibarr/dolibarr/commit/b65c79104351f34b4cd2c9e4b7edfea7d1c3a37f
Author: Laurent Destailleur <address@hidden>
Date: 2019-03-14 (Thu, 14 Mar 2019)
Changed paths:
M htdocs/admin/facture.php
M htdocs/admin/propal.php
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into 9.0
Commit: 307356776396d6c5c56a6c2976257500f6200916
https://github.com/Dolibarr/dolibarr/commit/307356776396d6c5c56a6c2976257500f6200916
Author: Laurent Destailleur <address@hidden>
Date: 2019-03-14 (Thu, 14 Mar 2019)
Changed paths:
A dev/resources/iso-normes/Accountancy-format_Ebp_txt.pdf
M htdocs/accountancy/class/accountancyexport.class.php
Log Message:
-----------
Merge branch '8.0' of address@hidden:Dolibarr/dolibarr.git into 9.0
Commit: 39e6e71b0d82e5647a23d370e6490197cd3c374e
https://github.com/Dolibarr/dolibarr/commit/39e6e71b0d82e5647a23d370e6490197cd3c374e
Author: Laurent Destailleur <address@hidden>
Date: 2019-03-14 (Thu, 14 Mar 2019)
Changed paths:
A dev/resources/iso-normes/Accountancy-format_Ebp_txt.pdf
M htdocs/accountancy/class/accountancyexport.class.php
M htdocs/admin/facture.php
M htdocs/admin/propal.php
M htdocs/expedition/card.php
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
Commit: 58fa1292f2e8ca87a9238e96f048bed82b963e08
https://github.com/Dolibarr/dolibarr/commit/58fa1292f2e8ca87a9238e96f048bed82b963e08
Author: Laurent Destailleur <address@hidden>
Date: 2019-03-14 (Thu, 14 Mar 2019)
Changed paths:
M htdocs/compta/resultat/result.php
M htdocs/core/class/commoninvoice.class.php
M htdocs/expensereport/card.php
M htdocs/product/class/html.formproduct.class.php
M htdocs/product/class/product.class.php
M htdocs/product/dynamic_price/class/price_parser.class.php
M htdocs/theme/eldy/global.inc.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/017b7d6696da...58fa1292f2e8