[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 4f9bb3: NEW: supplier credit notes: c
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 4f9bb3: NEW: supplier credit notes: convert to usable abso... |
|
Date: |
Thu, 08 Mar 2018 11:06:39 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 4f9bb336009b16bf9d827138631cab35c81ba2ea
https://github.com/Dolibarr/dolibarr/commit/4f9bb336009b16bf9d827138631cab35c81ba2ea
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-02-14 (Wed, 14 Feb 2018)
Changed paths:
M htdocs/compta/facture/card.php
M htdocs/core/class/commoninvoice.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/lib/doc.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/tpl/objectline_view.tpl.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/facture/card.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/consumption.php
Log Message:
-----------
NEW: supplier credit notes: convert to usable absolute discount + link/unlink
to supplier invoice + create supplier credit note from excess paid
Commit: daca27b2ed8e8a2924105de16b32f7f8d894d117
https://github.com/Dolibarr/dolibarr/commit/daca27b2ed8e8a2924105de16b32f7f8d894d117
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-02-14 (Wed, 14 Feb 2018)
Changed paths:
M htdocs/comm/card.php
M htdocs/comm/remx.php
M htdocs/core/class/discount.class.php
M htdocs/core/class/html.form.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/facture/card.php
M htdocs/install/mysql/migration/7.0.0-8.0.0.sql
M htdocs/install/mysql/tables/llx_societe_remise_except.key.sql
M htdocs/install/mysql/tables/llx_societe_remise_except.sql
M htdocs/societe/class/societe.class.php
Log Message:
-----------
NEW: supplier credit notes: split display in thirdparty discount page + fixes
+ refactoring
Commit: e2b65b3755476cb6cdbe9822332040a958e7ae30
https://github.com/Dolibarr/dolibarr/commit/e2b65b3755476cb6cdbe9822332040a958e7ae30
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-02-16 (Fri, 16 Feb 2018)
Changed paths:
M ChangeLog
M htdocs/adherents/type.php
M htdocs/admin/resource.php
M htdocs/admin/resource_extrafields.php
M htdocs/comm/index.php
M htdocs/comm/propal/card.php
M htdocs/comm/propal/index.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/recap-compta.php
M htdocs/compta/sociales/class/chargesociales.class.php
M htdocs/compta/tva/class/tva.class.php
M htdocs/conf/conf.php.example
M htdocs/contrat/card.php
M htdocs/contrat/class/contrat.class.php
M htdocs/contrat/services_list.php
M htdocs/contrat/tpl/linkedobjectblock.tpl.php
M htdocs/core/class/commondocgenerator.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/resource.lib.php
M htdocs/core/lib/website.lib.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/modBlockedLog.class.php
M htdocs/core/modules/modSociete.class.php
M htdocs/expedition/card.php
M htdocs/expedition/class/expedition.class.php
M htdocs/fourn/card.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/commande/list.php
M htdocs/hrm/index.php
M htdocs/imports/import.php
M htdocs/includes/odtphp/odf.php
M htdocs/install/check.php
M htdocs/install/repair.php
M htdocs/install/step5.php
M htdocs/install/upgrade2.php
M htdocs/langs/en_AU/main.lang
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/ecm.lang
M htdocs/langs/en_US/install.lang
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/website.lang
M htdocs/langs/es_EC/admin.lang
M htdocs/langs/es_ES/admin.lang
M htdocs/langs/es_ES/bills.lang
M htdocs/langs/es_ES/companies.lang
M htdocs/langs/es_ES/compta.lang
M htdocs/langs/es_ES/ecm.lang
M htdocs/langs/es_ES/mails.lang
M htdocs/langs/es_ES/main.lang
M htdocs/langs/es_ES/other.lang
M htdocs/langs/es_ES/salaries.lang
M htdocs/langs/es_ES/users.lang
M htdocs/langs/fr_FR/accountancy.lang
M htdocs/langs/fr_FR/admin.lang
M htdocs/langs/fr_FR/bills.lang
M htdocs/langs/fr_FR/companies.lang
M htdocs/langs/fr_FR/ecm.lang
M htdocs/langs/fr_FR/interventions.lang
M htdocs/langs/fr_FR/mails.lang
M htdocs/langs/fr_FR/main.lang
M htdocs/langs/fr_FR/modulebuilder.lang
M htdocs/langs/fr_FR/multicurrency.lang
M htdocs/langs/fr_FR/orders.lang
M htdocs/langs/fr_FR/other.lang
M htdocs/langs/fr_FR/printing.lang
M htdocs/langs/fr_FR/salaries.lang
M htdocs/langs/fr_FR/trips.lang
M htdocs/langs/fr_FR/users.lang
M htdocs/langs/nb_NO/admin.lang
M htdocs/langs/nb_NO/compta.lang
M htdocs/langs/nl_NL/admin.lang
M htdocs/langs/pt_BR/accountancy.lang
M htdocs/langs/pt_BR/admin.lang
M htdocs/langs/pt_BR/banks.lang
M htdocs/langs/pt_BR/bills.lang
M htdocs/langs/pt_BR/bookmarks.lang
M htdocs/langs/pt_BR/boxes.lang
M htdocs/langs/pt_BR/categories.lang
M htdocs/langs/pt_BR/commercial.lang
M htdocs/langs/pt_BR/companies.lang
M htdocs/langs/pt_BR/compta.lang
M htdocs/langs/pt_BR/contracts.lang
M htdocs/langs/pt_BR/cron.lang
M htdocs/langs/pt_BR/deliveries.lang
M htdocs/langs/pt_BR/dict.lang
M htdocs/langs/pt_BR/ecm.lang
M htdocs/langs/pt_BR/exports.lang
M htdocs/langs/pt_BR/holiday.lang
M htdocs/langs/pt_BR/install.lang
M htdocs/langs/pt_BR/interventions.lang
M htdocs/langs/pt_BR/languages.lang
M htdocs/langs/pt_BR/ldap.lang
M htdocs/langs/pt_BR/loan.lang
M htdocs/langs/pt_BR/main.lang
M htdocs/langs/pt_BR/margins.lang
M htdocs/langs/pt_BR/members.lang
M htdocs/langs/pt_BR/oauth.lang
M htdocs/langs/pt_BR/opensurvey.lang
M htdocs/langs/pt_BR/orders.lang
M htdocs/langs/pt_BR/paybox.lang
M htdocs/langs/pt_BR/paypal.lang
M htdocs/langs/pt_BR/productbatch.lang
M htdocs/langs/pt_BR/propal.lang
M htdocs/langs/pt_BR/resource.lang
M htdocs/langs/pt_BR/sendings.lang
M htdocs/langs/pt_BR/sms.lang
M htdocs/langs/pt_PT/admin.lang
M htdocs/langs/pt_PT/bills.lang
M htdocs/langs/pt_PT/companies.lang
M htdocs/langs/pt_PT/compta.lang
M htdocs/langs/pt_PT/ecm.lang
M htdocs/langs/pt_PT/interventions.lang
M htdocs/langs/pt_PT/loan.lang
M htdocs/langs/pt_PT/main.lang
M htdocs/langs/pt_PT/trips.lang
M htdocs/langs/pt_PT/withdrawals.lang
M htdocs/langs/pt_PT/workflow.lang
M htdocs/main.inc.php
M htdocs/modulebuilder/template/class/myobject.class.php
M htdocs/modulebuilder/template/myobject_card.php
M htdocs/modulebuilder/template/myobject_list.php
M htdocs/product/fournisseurs.php
M htdocs/product/list.php
M htdocs/projet/card.php
M htdocs/projet/contact.php
M htdocs/projet/element.php
M htdocs/projet/ganttview.php
M htdocs/projet/tasks.php
M htdocs/projet/tasks/comment.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
M htdocs/societe/card.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/index.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
M htdocs/website/class/websitepage.class.php
M htdocs/website/index.php
M test/phpunit/CodingPhpTest.php
Log Message:
-----------
Merge branch 'develop' of github.com:Dolibarr/dolibarr into
NEW_supplier_credit_note
Commit: bd486e4cabae60ec559f12a6b88495efc8081df2
https://github.com/Dolibarr/dolibarr/commit/bd486e4cabae60ec559f12a6b88495efc8081df2
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-02-16 (Fri, 16 Feb 2018)
Changed paths:
M htdocs/fourn/facture/card.php
Log Message:
-----------
FIX: remove var_dump
Commit: 905adab5176331c11b9936e06f8815723a06a272
https://github.com/Dolibarr/dolibarr/commit/905adab5176331c11b9936e06f8815723a06a272
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-02-16 (Fri, 16 Feb 2018)
Changed paths:
M htdocs/commande/card.php
M htdocs/fourn/commande/card.php
Log Message:
-----------
NEW: supplier credit notes: display supplier discounts in supplier order card
Commit: d2bb6a790b2bc98a36ecc05012362dc4656be75d
https://github.com/Dolibarr/dolibarr/commit/d2bb6a790b2bc98a36ecc05012362dc4656be75d
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-02-16 (Fri, 16 Feb 2018)
Changed paths:
M htdocs/fourn/commande/card.php
M htdocs/supplier_proposal/card.php
Log Message:
-----------
NEW: supplier credit notes: display supplier discounts in supplier proposal
card
Commit: 7367769ec36f96be619cc950cc3e5d6c14c64b61
https://github.com/Dolibarr/dolibarr/commit/7367769ec36f96be619cc950cc3e5d6c14c64b61
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-02-16 (Fri, 16 Feb 2018)
Changed paths:
M htdocs/fourn/facture/card.php
Log Message:
-----------
FIX: supplier credit notes: use correct rights in supplier invoice card
Commit: fa0c65e37ee1f35d1282ff8029616fd82d65186a
https://github.com/Dolibarr/dolibarr/commit/fa0c65e37ee1f35d1282ff8029616fd82d65186a
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-02-16 (Fri, 16 Feb 2018)
Changed paths:
M htdocs/comm/remx.php
Log Message:
-----------
FIX: supplier credit notes: correctly handle discount split
Commit: 924a9c392cd5cecf4c9e7666a9df38cf1e7f2037
https://github.com/Dolibarr/dolibarr/commit/924a9c392cd5cecf4c9e7666a9df38cf1e7f2037
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-02-16 (Fri, 16 Feb 2018)
Changed paths:
M htdocs/fourn/commande/card.php
M htdocs/fourn/facture/card.php
M htdocs/supplier_proposal/card.php
Log Message:
-----------
FIX: supplier credit notes: hide relative discounts until supported
Commit: f5ad93b272cfcc0d699ee3b9130640520ff5b6d3
https://github.com/Dolibarr/dolibarr/commit/f5ad93b272cfcc0d699ee3b9130640520ff5b6d3
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-02-19 (Mon, 19 Feb 2018)
Changed paths:
M htdocs/comm/remx.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/lib/doc.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/tpl/objectline_view.tpl.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/facture/card.php
M htdocs/langs/en_US/bills.lang
M htdocs/langs/en_US/companies.lang
M htdocs/societe/consumption.php
Log Message:
-----------
NEW: supplier credit notes: handle Excess Paid + translation
Commit: 57b8df400806f726946cb4ccca55f44dac548dc8
https://github.com/Dolibarr/dolibarr/commit/57b8df400806f726946cb4ccca55f44dac548dc8
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-02-19 (Mon, 19 Feb 2018)
Changed paths:
M htdocs/fourn/class/fournisseur.facture.class.php
Log Message:
-----------
FIX: supplier credit notes: delete discount when deleting linked
invoice/invoice line
Commit: a66f7b8bc84428b5c285b46cb2d93d4779226558
https://github.com/Dolibarr/dolibarr/commit/a66f7b8bc84428b5c285b46cb2d93d4779226558
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-02-19 (Mon, 19 Feb 2018)
Changed paths:
M htdocs/compta/facture/card.php
M htdocs/fourn/facture/card.php
Log Message:
-----------
FIX: supplier credit notes: wrong discount filters
Commit: 44b0d1ca0f7ca360d2f2fb6ebc743ac644be3764
https://github.com/Dolibarr/dolibarr/commit/44b0d1ca0f7ca360d2f2fb6ebc743ac644be3764
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-02-19 (Mon, 19 Feb 2018)
Changed paths:
M build/debian/patches/use-etc-dolibarr-conf.patch
M build/debian/rules
M build/makepack-dolibarr.pl
M build/rpm/dolibarr-forrpm.patch
M build/rpm/dolibarr_fedora.spec
M build/rpm/dolibarr_generic.spec
M build/rpm/httpd-dolibarr.conf
M htdocs/admin/mails.php
M htdocs/admin/system/dolibarr.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/website.lib.php
M htdocs/filefunc.inc.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/errors.lang
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/trips.lang
M htdocs/langs/en_US/users.lang
M htdocs/langs/en_US/website.lang
M htdocs/support/inc.php
M htdocs/website/class/websitepage.class.php
M htdocs/website/index.php
Log Message:
-----------
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
Commit: bcb39e57fb45ad0a85875e4bcae6eba18cef1799
https://github.com/Dolibarr/dolibarr/commit/bcb39e57fb45ad0a85875e4bcae6eba18cef1799
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-02-20 (Tue, 20 Feb 2018)
Changed paths:
M htdocs/fourn/facture/card.php
Log Message:
-----------
FIX: supplier credit notes: wrong credit note filter
Commit: a4f2a2532de1a07670e6b1662b062deb353a92ca
https://github.com/Dolibarr/dolibarr/commit/a4f2a2532de1a07670e6b1662b062deb353a92ca
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-02-20 (Tue, 20 Feb 2018)
Changed paths:
M htdocs/fourn/commande/card.php
M htdocs/fourn/facture/card.php
M htdocs/supplier_proposal/card.php
Log Message:
-----------
FIX: supplier credit notes: use MAIN_FEATURES_LEVEL
Commit: 95be1550100ff94cc1a1529c21dccbb536f5452f
https://github.com/Dolibarr/dolibarr/commit/95be1550100ff94cc1a1529c21dccbb536f5452f
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-02-20 (Tue, 20 Feb 2018)
Changed paths:
M htdocs/comm/card.php
M htdocs/comm/propal/card.php
M htdocs/commande/card.php
M htdocs/compta/facture/prelevement.php
M htdocs/core/class/html.form.class.php
M htdocs/expedition/shipment.php
M htdocs/fourn/commande/card.php
M htdocs/societe/class/api_thirdparties.class.php
M htdocs/supplier_proposal/card.php
Log Message:
-----------
FIX: supplier credit notes: harmonize discount filters
Commit: d3f848b7bc7b3a957bc522eba8aecd934467033e
https://github.com/Dolibarr/dolibarr/commit/d3f848b7bc7b3a957bc522eba8aecd934467033e
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-02-21 (Wed, 21 Feb 2018)
Changed paths:
M htdocs/compta/facture/prelevement.php
M htdocs/expedition/shipment.php
Log Message:
-----------
FIX: supplier credit notes: harmonize discount filters part 2
Commit: cfdbef6bc30f38b8a945bb9e5a826d05854b66d0
https://github.com/Dolibarr/dolibarr/commit/cfdbef6bc30f38b8a945bb9e5a826d05854b66d0
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-02-21 (Wed, 21 Feb 2018)
Changed paths:
M htdocs/fourn/card.php
Log Message:
-----------
NEW: supplier credit notes: display supplier discounts in supplier card
Commit: 34d84c6d5dde9c664fed7c8726f9df75ed8be61a
https://github.com/Dolibarr/dolibarr/commit/34d84c6d5dde9c664fed7c8726f9df75ed8be61a
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-02-21 (Wed, 21 Feb 2018)
Changed paths:
M htdocs/fourn/facture/card.php
Log Message:
-----------
FIX: supplier credit notes: display link to discount in supplier credit note
card
Commit: 876ea3198f735e511a8d1aa47680a908c256065e
https://github.com/Dolibarr/dolibarr/commit/876ea3198f735e511a8d1aa47680a908c256065e
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-02-21 (Wed, 21 Feb 2018)
Changed paths:
M htdocs/fourn/facture/list.php
Log Message:
-----------
FIX: handle type in supplier invoice list
Commit: 7ca5ac03ccb5a758434b70b7537bf8676dcda968
https://github.com/Dolibarr/dolibarr/commit/7ca5ac03ccb5a758434b70b7537bf8676dcda968
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-02-26 (Mon, 26 Feb 2018)
Changed paths:
M htdocs/comm/remx.php
M htdocs/langs/en_US/companies.lang
Log Message:
-----------
FIX: discount card: only display relevant discounts types (customer/supplier)
Commit: 239e83491333c71d705f6666818a98352e7a86b1
https://github.com/Dolibarr/dolibarr/commit/239e83491333c71d705f6666818a98352e7a86b1
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-02-27 (Tue, 27 Feb 2018)
Changed paths:
M htdocs/fourn/class/fournisseur.facture.class.php
Log Message:
-----------
FIX: supplier credit notes: remove handled TODO
Commit: 9cf45266f5e7849e9b3c3827b7ff9255ddb5901e
https://github.com/Dolibarr/dolibarr/commit/9cf45266f5e7849e9b3c3827b7ff9255ddb5901e
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-02-27 (Tue, 27 Feb 2018)
Changed paths:
M htdocs/comm/remise.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/fourn/card.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/facture/card.php
M htdocs/install/mysql/migration/7.0.0-8.0.0.sql
M htdocs/install/mysql/tables/llx_societe.sql
A htdocs/install/mysql/tables/llx_societe_remise_supplier.sql
M htdocs/langs/en_US/companies.lang
M htdocs/societe/card.php
M htdocs/societe/class/api_thirdparties.class.php
M htdocs/societe/class/societe.class.php
M htdocs/supplier_proposal/card.php
Log Message:
-----------
NEW: supplier relative discounts
Commit: 7cd1b2caa91c240368a6334bd3a2e41e0d0cfb0f
https://github.com/Dolibarr/dolibarr/commit/7cd1b2caa91c240368a6334bd3a2e41e0d0cfb0f
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-02-27 (Tue, 27 Feb 2018)
Changed paths:
M ChangeLog
M dev/initdemo/initdemo.sh
M htdocs/accountancy/admin/categories_list.php
M htdocs/accountancy/class/accountancycategory.class.php
M htdocs/accountancy/customer/lines.php
M htdocs/accountancy/expensereport/lines.php
M htdocs/accountancy/supplier/lines.php
M htdocs/adherents/card.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/class/adherent_type.class.php
M htdocs/adherents/class/api_memberstypes.class.php
M htdocs/adherents/index.php
M htdocs/adherents/list.php
M htdocs/adherents/type.php
M htdocs/admin/dict.php
M htdocs/admin/mails_senderprofile_list.php
M htdocs/admin/modulehelp.php
M htdocs/admin/modules.php
M htdocs/admin/system/filecheck.php
M htdocs/api/class/api_setup.class.php
M htdocs/barcode/codeinit.php
M htdocs/cashdesk/class/Facturation.class.php
M htdocs/cashdesk/validation_verif.php
M htdocs/categories/class/categorie.class.php
M htdocs/categories/viewcat.php
M htdocs/comm/action/card.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/document.php
M htdocs/comm/card.php
M htdocs/comm/propal/card.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/comm/propal/list.php
M htdocs/commande/card.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/list.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/class/facture-rec.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/compta/facture/list.php
M htdocs/contact/agenda.php
M htdocs/contact/card.php
M htdocs/contact/class/contact.class.php
M htdocs/contrat/card.php
M htdocs/contrat/class/contrat.class.php
M htdocs/contrat/list.php
M htdocs/core/actions_massactions.inc.php
M htdocs/core/boxes/box_members.php
M htdocs/core/class/commondocgenerator.class.php
M htdocs/core/class/commoninvoice.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/ctyperesource.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formactions.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/class/html.formmargin.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/class/html.formprojet.class.php
M htdocs/core/class/html.formwebsite.class.php
M htdocs/core/class/translate.class.php
M htdocs/core/js/timesheet.js
M htdocs/core/lib/admin.lib.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/lib/security.lib.php
M htdocs/core/lib/website.lib.php
M htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
M htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
M htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
M htdocs/core/modules/mailings/fraise.modules.php
M htdocs/core/modules/modAccounting.class.php
M htdocs/core/modules/modAdherent.class.php
M htdocs/core/modules/modAgenda.class.php
M htdocs/core/modules/modApi.class.php
M htdocs/core/modules/modBanque.class.php
M htdocs/core/modules/modBarcode.class.php
M htdocs/core/modules/modBlockedLog.class.php
M htdocs/core/modules/modBookmark.class.php
M htdocs/core/modules/modCashDesk.class.php
M htdocs/core/modules/modCategorie.class.php
M htdocs/core/modules/modClickToDial.class.php
M htdocs/core/modules/modCollab.class.php
M htdocs/core/modules/modCommande.class.php
M htdocs/core/modules/modComptabilite.class.php
M htdocs/core/modules/modContrat.class.php
M htdocs/core/modules/modCron.class.php
M htdocs/core/modules/modDeplacement.class.php
M htdocs/core/modules/modDocumentGeneration.class.php
M htdocs/core/modules/modDon.class.php
M htdocs/core/modules/modDynamicPrices.class.php
M htdocs/core/modules/modECM.class.php
M htdocs/core/modules/modExpedition.class.php
M htdocs/core/modules/modExpenseReport.class.php
M htdocs/core/modules/modExport.class.php
M htdocs/core/modules/modExternalRss.class.php
M htdocs/core/modules/modExternalSite.class.php
M htdocs/core/modules/modFTP.class.php
M htdocs/core/modules/modFacture.class.php
M htdocs/core/modules/modFckeditor.class.php
M htdocs/core/modules/modFicheinter.class.php
M htdocs/core/modules/modFournisseur.class.php
M htdocs/core/modules/modGeoIPMaxmind.class.php
M htdocs/core/modules/modGravatar.class.php
M htdocs/core/modules/modHRM.class.php
M htdocs/core/modules/modHoliday.class.php
M htdocs/core/modules/modImport.class.php
M htdocs/core/modules/modIncoterm.class.php
M htdocs/core/modules/modLabel.class.php
M htdocs/core/modules/modLdap.class.php
M htdocs/core/modules/modLoan.class.php
M htdocs/core/modules/modMailing.class.php
M htdocs/core/modules/modMailmanSpip.class.php
M htdocs/core/modules/modMargin.class.php
M htdocs/core/modules/modModuleBuilder.class.php
M htdocs/core/modules/modMultiCurrency.class.php
M htdocs/core/modules/modNotification.class.php
M htdocs/core/modules/modOauth.class.php
M htdocs/core/modules/modOpenSurvey.class.php
M htdocs/core/modules/modPaybox.class.php
M htdocs/core/modules/modPaypal.class.php
M htdocs/core/modules/modPrelevement.class.php
M htdocs/core/modules/modPrinting.class.php
M htdocs/core/modules/modProduct.class.php
M htdocs/core/modules/modProductBatch.class.php
M htdocs/core/modules/modProjet.class.php
M htdocs/core/modules/modPropale.class.php
M htdocs/core/modules/modReceiptPrinter.class.php
M htdocs/core/modules/modResource.class.php
M htdocs/core/modules/modSalaries.class.php
M htdocs/core/modules/modService.class.php
M htdocs/core/modules/modSkype.class.php
M htdocs/core/modules/modSociete.class.php
M htdocs/core/modules/modStock.class.php
M htdocs/core/modules/modStripe.class.php
M htdocs/core/modules/modSupplierProposal.class.php
M htdocs/core/modules/modSyslog.class.php
M htdocs/core/modules/modTax.class.php
M htdocs/core/modules/modUser.class.php
M htdocs/core/modules/modVariants.class.php
M htdocs/core/modules/modWebServices.class.php
M htdocs/core/modules/modWebServicesClient.class.php
M htdocs/core/modules/modWebsite.class.php
M htdocs/core/modules/modWorkflow.class.php
M htdocs/core/modules/product/doc/doc_generic_product_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/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
M htdocs/core/modules/syslog/mod_syslog_file.php
M htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
M htdocs/core/tpl/admin_extrafields_add.tpl.php
M htdocs/core/tpl/admin_extrafields_edit.tpl.php
M htdocs/core/tpl/contacts.tpl.php
M htdocs/core/tpl/extrafields_view.tpl.php
M htdocs/cron/card.php
M htdocs/cron/class/cronjob.class.php
M htdocs/cron/info.php
M htdocs/cron/list.php
M htdocs/don/card.php
M htdocs/don/class/don.class.php
M htdocs/ecm/class/ecmdirectory.class.php
M htdocs/ecm/class/ecmfiles.class.php
M htdocs/ecm/dir_card.php
M htdocs/expedition/card.php
M htdocs/expedition/class/expedition.class.php
M htdocs/expedition/shipment.php
M htdocs/expensereport/card.php
M htdocs/expensereport/class/expensereport.class.php
M htdocs/expensereport/list.php
M htdocs/fichinter/card.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fichinter/list.php
M htdocs/fourn/card.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/card.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/facture/card.php
M htdocs/fourn/facture/list.php
M htdocs/holiday/card.php
M htdocs/holiday/define_holiday.php
M htdocs/hrm/establishment/card.php
M htdocs/imports/import.php
A htdocs/install/mysql/data/llx_c_type_container.sql
M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/install/mysql/migration/7.0.0-8.0.0.sql
A htdocs/install/mysql/tables/llx_c_type_container.key.sql
A htdocs/install/mysql/tables/llx_c_type_container.sql
M htdocs/install/mysql/tables/llx_expensereport_det.sql
M htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
M htdocs/install/step1.php
M htdocs/install/upgrade2.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/cron.lang
M htdocs/langs/en_US/ecm.lang
M htdocs/langs/en_US/errors.lang
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/other.lang
M htdocs/langs/en_US/projects.lang
M htdocs/langs/en_US/website.lang
M htdocs/livraison/card.php
M htdocs/livraison/class/livraison.class.php
M htdocs/modulebuilder/template/admin/about.php
M htdocs/modulebuilder/template/admin/setup.php
M htdocs/modulebuilder/template/class/actions_mymodule.class.php
M htdocs/modulebuilder/template/core/modules/modMyModule.class.php
M
htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
M htdocs/modulebuilder/template/myobject_card.php
M htdocs/modulebuilder/template/myobject_list.php
M htdocs/product/admin/product.php
M htdocs/product/class/product.class.php
M htdocs/product/composition/card.php
M htdocs/product/dynamic_price/class/price_parser.class.php
M htdocs/product/fournisseurs.php
M htdocs/product/inventory/card.php
M htdocs/product/inventory/list.php
M htdocs/product/list.php
M htdocs/product/stock/card.php
M htdocs/product/stock/class/mouvementstock.class.php
M htdocs/product/stock/class/productlot.class.php
M htdocs/product/stock/class/productstockentrepot.class.php
M htdocs/product/stock/productlot_card.php
M htdocs/product/stock/productlot_list.php
M htdocs/projet/activity/perday.php
M htdocs/projet/activity/perweek.php
M htdocs/projet/card.php
M htdocs/projet/class/project.class.php
M htdocs/projet/class/task.class.php
M htdocs/projet/tasks.php
M htdocs/projet/tasks/comment.php
M htdocs/projet/tasks/task.php
M htdocs/projet/tasks/time.php
M htdocs/public/demo/index.php
M htdocs/public/members/public_card.php
M htdocs/resource/class/dolresource.class.php
M htdocs/societe/card.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/contact.php
M htdocs/societe/list.php
M htdocs/societe/societecontact.php
M htdocs/societe/website.php
M htdocs/supplier_proposal/card.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
M htdocs/supplier_proposal/list.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
M htdocs/user/card.php
M htdocs/user/class/user.class.php
M htdocs/user/class/usergroup.class.php
M htdocs/user/group/card.php
M htdocs/user/index.php
M htdocs/webservices/server_actioncomm.php
M htdocs/webservices/server_contact.php
M htdocs/webservices/server_productorservice.php
M htdocs/webservices/server_project.php
M htdocs/webservices/server_thirdparty.php
M htdocs/website/index.php
A htdocs/website/page-sample-corporatehome.html
A htdocs/website/page-sample-empty.html
R htdocs/website/pagetemplate.html
M htdocs/website/websiteaccount_card.php
Log Message:
-----------
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
Commit: 059801fe03ffe0321d888d2d9e11c6aa579832fb
https://github.com/Dolibarr/dolibarr/commit/059801fe03ffe0321d888d2d9e11c6aa579832fb
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-03-01 (Thu, 01 Mar 2018)
Changed paths:
M htdocs/accountancy/admin/export.php
M htdocs/accountancy/admin/index.php
M htdocs/adherents/admin/adherent.php
M htdocs/adherents/admin/adherent_emails.php
M htdocs/adherents/admin/adherent_extrafields.php
M htdocs/adherents/admin/adherent_type_extrafields.php
M htdocs/adherents/admin/website.php
M htdocs/admin/agenda.php
M htdocs/admin/agenda_extrafields.php
M htdocs/admin/agenda_extsites.php
M htdocs/admin/agenda_other.php
M htdocs/admin/agenda_reminder.php
M htdocs/admin/agenda_xcal.php
M htdocs/admin/bank.php
M htdocs/admin/bank_extrafields.php
M htdocs/admin/barcode.php
M htdocs/admin/chequereceipts.php
M htdocs/admin/clicktodial.php
M htdocs/admin/commande.php
M htdocs/admin/compta.php
M htdocs/admin/confexped.php
M htdocs/admin/contract.php
M htdocs/admin/ecm.php
M htdocs/admin/events.php
M htdocs/admin/expedition.php
M htdocs/admin/expedition_extrafields.php
M htdocs/admin/expeditiondet_extrafields.php
M htdocs/admin/expensereport.php
M htdocs/admin/expensereport_extrafields.php
M htdocs/admin/expensereport_ik.php
M htdocs/admin/expensereport_rules.php
M htdocs/admin/external_rss.php
M htdocs/admin/facture.php
M htdocs/admin/fckeditor.php
M htdocs/admin/fichinter.php
M htdocs/admin/geoipmaxmind.php
M htdocs/admin/ldap.php
M htdocs/admin/ldap_contacts.php
M htdocs/admin/ldap_groups.php
M htdocs/admin/ldap_members.php
M htdocs/admin/ldap_members_types.php
M htdocs/admin/ldap_users.php
M htdocs/admin/livraison.php
M htdocs/admin/livraison_extrafields.php
M htdocs/admin/livraisondet_extrafields.php
M htdocs/admin/loan.php
M htdocs/admin/mailing.php
M htdocs/admin/mailman.php
M htdocs/admin/multicurrency.php
M htdocs/admin/notification.php
M htdocs/admin/oauth.php
M htdocs/admin/oauthlogintokens.php
M htdocs/admin/order_extrafields.php
M htdocs/admin/orderdet_extrafields.php
M htdocs/admin/payment.php
M htdocs/admin/prelevement.php
M htdocs/admin/propal.php
M htdocs/admin/receiptprinter.php
M htdocs/admin/resource.php
M htdocs/admin/resource_extrafields.php
M htdocs/admin/salaries.php
M htdocs/admin/spip.php
M htdocs/admin/stock.php
M htdocs/admin/supplier_invoice.php
M htdocs/admin/supplier_order.php
M htdocs/admin/supplier_payment.php
M htdocs/admin/supplier_proposal.php
M htdocs/admin/supplierinvoice_extrafields.php
M htdocs/admin/supplierinvoicedet_extrafields.php
M htdocs/admin/supplierorder_extrafields.php
M htdocs/admin/supplierorderdet_extrafields.php
M htdocs/admin/syslog.php
M htdocs/admin/taxes.php
M htdocs/admin/usergroup.php
M htdocs/admin/workflow.php
M htdocs/api/admin/explorer.php
M htdocs/api/admin/index.php
M htdocs/bookmarks/admin/bookmark.php
M htdocs/cashdesk/admin/cashdesk.php
M htdocs/categories/admin/categorie.php
M htdocs/categories/admin/categorie_extrafields.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/admin/propal_extrafields.php
M htdocs/comm/admin/propaldet_extrafields.php
M htdocs/comm/card.php
M htdocs/comm/remise.php
M htdocs/compta/facture/admin/facture_cust_extrafields.php
M htdocs/compta/facture/admin/facture_rec_cust_extrafields.php
M htdocs/compta/facture/admin/facturedet_cust_extrafields.php
M htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php
M htdocs/compta/facture/class/facture-rec.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/compta/facture/invoicetemplate_list.php
M htdocs/compta/paiement/card.php
M htdocs/compta/paiement/class/paiement.class.php
M htdocs/contrat/admin/contract_extrafields.php
M htdocs/contrat/admin/contractdet_extrafields.php
M htdocs/contrat/card.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/class/CMailFile.class.php
M htdocs/core/class/commoninvoice.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/hookmanager.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/product.lib.php
M htdocs/core/lib/website.lib.php
M htdocs/core/modules/oauth/github_oauthcallback.php
M htdocs/core/modules/oauth/google_oauthcallback.php
M htdocs/core/tpl/admin_extrafields_add.tpl.php
M htdocs/core/tpl/admin_extrafields_edit.tpl.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/cron/admin/cron.php
M htdocs/cron/list.php
M htdocs/don/admin/donation.php
M htdocs/don/admin/donation_extrafields.php
M htdocs/externalsite/admin/externalsite.php
M htdocs/fichinter/admin/fichinter_extrafields.php
M htdocs/fichinter/admin/fichinterdet_extrafields.php
M htdocs/ftp/admin/ftpclient.php
M htdocs/hrm/admin/admin_establishment.php
M htdocs/hrm/admin/admin_hrm.php
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/install/mysql/migration/7.0.0-8.0.0.sql
M htdocs/install/mysql/tables/llx_website_page.sql
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/agenda.lang
M htdocs/langs/en_US/website.lang
M htdocs/margin/admin/margin.php
M htdocs/paybox/admin/paybox.php
M htdocs/paypal/admin/paypal.php
M htdocs/printing/admin/printing.php
M htdocs/product/admin/dynamic_prices.php
M htdocs/product/admin/price_rules.php
M htdocs/product/admin/product.php
M htdocs/product/admin/product_extrafields.php
M htdocs/product/admin/product_lot_extrafields.php
M htdocs/product/composition/card.php
M htdocs/projet/admin/project.php
M htdocs/projet/admin/project_extrafields.php
M htdocs/projet/admin/project_task_extrafields.php
M htdocs/projet/tasks/time.php
M htdocs/public/agenda/agendaexport.php
M htdocs/societe/admin/contact_extrafields.php
M htdocs/societe/admin/societe.php
M htdocs/societe/admin/societe_extrafields.php
M htdocs/stripe/admin/stripe.php
M htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
M htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
M htdocs/user/admin/group_extrafields.php
M htdocs/user/admin/user_extrafields.php
M htdocs/variants/admin/admin.php
M htdocs/webservices/admin/index.php
M htdocs/website/class/website.class.php
M htdocs/website/class/websitepage.class.php
M htdocs/website/index.php
Log Message:
-----------
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
Commit: 24ffce0be5393216186470e168db83be8371ec9b
https://github.com/Dolibarr/dolibarr/commit/24ffce0be5393216186470e168db83be8371ec9b
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-03-01 (Thu, 01 Mar 2018)
Changed paths:
M htdocs/accountancy/journal/purchasesjournal.php
Log Message:
-----------
FIX: supplier credit notes: accounting display in purchases journal
Commit: e07177fec2367c56ad60ee2980993625d81b05dd
https://github.com/Dolibarr/dolibarr/commit/e07177fec2367c56ad60ee2980993625d81b05dd
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-03-01 (Thu, 01 Mar 2018)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/core/tpl/objectline_create.tpl.php
Log Message:
-----------
FIX: supplier relativ discounts: pre-fill newlines with qty/discount
Commit: 451d943927f0625a742ae99e353ed5956ad3a0d0
https://github.com/Dolibarr/dolibarr/commit/451d943927f0625a742ae99e353ed5956ad3a0d0
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-03-02 (Fri, 02 Mar 2018)
Changed paths:
M htdocs/comm/propal/card.php
M htdocs/commande/card.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/prelevement.php
M htdocs/core/class/html.form.class.php
A htdocs/core/tpl/object_discounts.tpl.php
M htdocs/expedition/shipment.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/facture/card.php
M htdocs/langs/en_US/companies.lang
M htdocs/supplier_proposal/card.php
Log Message:
-----------
NEW: supplier credit notes: factorized discount block (+ correct translations
for supplier discounts)
Commit: 6a4a3c9e824dc3ca2596929a9e5391589ea46085
https://github.com/Dolibarr/dolibarr/commit/6a4a3c9e824dc3ca2596929a9e5391589ea46085
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-03-05 (Mon, 05 Mar 2018)
Changed paths:
M htdocs/comm/remise.php
M htdocs/comm/remx.php
M htdocs/fourn/card.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/facture/card.php
M htdocs/supplier_proposal/card.php
Log Message:
-----------
NEW: supplier credit notes: remove MAIN_FEATURES_LEVEL
Commit: 1765b09fdaaceb2d6c1cbba1f986096d3a1ad37c
https://github.com/Dolibarr/dolibarr/commit/1765b09fdaaceb2d6c1cbba1f986096d3a1ad37c
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-03-05 (Mon, 05 Mar 2018)
Changed paths:
M htdocs/admin/agenda_extsites.php
M htdocs/admin/propal.php
M htdocs/admin/tools/purge.php
M htdocs/api/class/api_documents.class.php
M htdocs/blockedlog/class/blockedlog.class.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/card.php
M htdocs/comm/index.php
M htdocs/comm/mailing/card.php
M htdocs/comm/mailing/cibles.php
M htdocs/comm/propal/card.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/comm/propal/document.php
M htdocs/comm/propal/index.php
M htdocs/comm/propal/list.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/bank/bankentries_list.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/compta/facture/invoicetemplate_list.php
M htdocs/compta/localtax/class/localtax.class.php
M htdocs/compta/paiement.php
R htdocs/compta/paiement/avalider.php
M htdocs/compta/paiement/cheque/card.php
M htdocs/compta/paiement/cheque/class/remisecheque.class.php
M htdocs/compta/paiement/cheque/index.php
M htdocs/compta/paiement/class/paiement.class.php
A htdocs/compta/paiement/tovalidate.php
M htdocs/contrat/card.php
M htdocs/contrat/contact.php
M htdocs/contrat/document.php
M htdocs/contrat/info.php
M htdocs/contrat/list.php
M htdocs/contrat/note.php
M htdocs/core/boxes/box_graph_invoices_permonth.php
M htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
M htdocs/core/boxes/box_graph_orders_permonth.php
M htdocs/core/boxes/box_graph_orders_supplier_permonth.php
M htdocs/core/boxes/box_graph_product_distribution.php
M htdocs/core/boxes/box_graph_propales_permonth.php
M htdocs/core/class/commondocgenerator.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/conf.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formactions.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/class/html.formwebsite.class.php
M htdocs/core/class/notify.class.php
M htdocs/core/class/utils.class.php
M htdocs/core/lib/admin.lib.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/propal.lib.php
M htdocs/core/lib/website.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/dons/html_cerfafr.html
M htdocs/core/modules/dons/html_cerfafr.modules.php
M htdocs/core/modules/modPaypal.class.php
M htdocs/core/modules/modStripe.class.php
M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/tpl/admin_extrafields_view.tpl.php
M htdocs/core/tpl/contacts.tpl.php
M htdocs/core/tpl/notes.tpl.php
M htdocs/cron/class/cronjob.class.php
M htdocs/cron/list.php
M htdocs/don/admin/donation.php
M htdocs/don/admin/donation_extrafields.php
M htdocs/don/card.php
M htdocs/don/class/don.class.php
M htdocs/expedition/card.php
M htdocs/expedition/class/expeditionbatch.class.php
M htdocs/fourn/card.php
M htdocs/index.php
M htdocs/install/mysql/tables/llx_don.sql
M htdocs/install/mysql/tables/llx_expensereport_rules.sql
M htdocs/install/step2.php
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/other.lang
M htdocs/langs/en_US/paypal.lang
M htdocs/langs/en_US/projects.lang
M htdocs/langs/en_US/stripe.lang
M htdocs/modulebuilder/template/scripts/myobject.php
M htdocs/paybox/admin/paybox.php
M htdocs/paypal/admin/paypal.php
M htdocs/paypal/lib/paypal.lib.php
M htdocs/product/stock/card.php
M htdocs/product/stock/massstockmove.php
M htdocs/projet/class/project.class.php
M htdocs/projet/tasks/task.php
M htdocs/public/payment/newpayment.php
M htdocs/public/payment/paymentok.php
M htdocs/public/paypal/newpayment.php
M htdocs/public/stripe/newpayment.php
M htdocs/societe/class/societe.class.php
M htdocs/stripe/admin/stripe.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
M htdocs/user/card.php
M htdocs/website/class/website.class.php
Log Message:
-----------
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
Commit: 480d756090a06699a47f61cd89e807a61c8c69ce
https://github.com/Dolibarr/dolibarr/commit/480d756090a06699a47f61cd89e807a61c8c69ce
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-03-05 (Mon, 05 Mar 2018)
Changed paths:
M htdocs/core/class/discount.class.php
Log Message:
-----------
FIX: supplier discounts: typo
Commit: f1faf155fc8d3154cb6a06fba3d3036e85a1639d
https://github.com/Dolibarr/dolibarr/commit/f1faf155fc8d3154cb6a06fba3d3036e85a1639d
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-03-05 (Mon, 05 Mar 2018)
Changed paths:
M htdocs/core/class/discount.class.php
Log Message:
-----------
FIX: supplier discounts: wrong link to source supplier invoice
Commit: c4950d4f0c193fe7618a434ee5ea0078054f3a37
https://github.com/Dolibarr/dolibarr/commit/c4950d4f0c193fe7618a434ee5ea0078054f3a37
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-03-05 (Mon, 05 Mar 2018)
Changed paths:
M htdocs/core/lib/doc.lib.php
Log Message:
-----------
FIX: supplier discounts: wrong source invoice ref in DOCs
Commit: fad521d66cbc76ee1fc8f0f302714ac67b9d3e03
https://github.com/Dolibarr/dolibarr/commit/fad521d66cbc76ee1fc8f0f302714ac67b9d3e03
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-03-05 (Mon, 05 Mar 2018)
Changed paths:
M htdocs/install/mysql/migration/7.0.0-8.0.0.sql
Log Message:
-----------
FIX: supplier disocunts: add forgotten index to migration script
Commit: 1c9e7145e7562d615b3c71cd7cee7ade5c82ee3b
https://github.com/Dolibarr/dolibarr/commit/1c9e7145e7562d615b3c71cd7cee7ade5c82ee3b
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-08 (Thu, 08 Mar 2018)
Changed paths:
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/comm/propal/card.php
M htdocs/comm/remise.php
M htdocs/comm/remx.php
M htdocs/commande/card.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/prelevement.php
M htdocs/core/class/commoninvoice.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/lib/doc.lib.php
M htdocs/core/lib/pdf.lib.php
A htdocs/core/tpl/object_discounts.tpl.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/core/tpl/objectline_view.tpl.php
M htdocs/expedition/shipment.php
M htdocs/fourn/card.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/facture/card.php
M htdocs/fourn/facture/list.php
M htdocs/install/mysql/migration/7.0.0-8.0.0.sql
M htdocs/install/mysql/tables/llx_societe.sql
M htdocs/install/mysql/tables/llx_societe_remise_except.key.sql
M htdocs/install/mysql/tables/llx_societe_remise_except.sql
A htdocs/install/mysql/tables/llx_societe_remise_supplier.sql
M htdocs/langs/en_US/bills.lang
M htdocs/langs/en_US/companies.lang
M htdocs/societe/card.php
M htdocs/societe/class/api_thirdparties.class.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/consumption.php
M htdocs/supplier_proposal/card.php
Log Message:
-----------
Merge pull request #8276 from ATM-Consulting/develop_atm
NEW: supplier credit notes & discounts (absolute and relative)
Compare:
https://github.com/Dolibarr/dolibarr/compare/e0af4f848972...1c9e7145e756
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] 4f9bb3: NEW: supplier credit notes: convert to usable abso...,
Laurent Destailleur <=