Merge branch '15.0' of https://github.com/OCA/hr-expense into 15.0-mi…

…g-hr_expense_substate

.copier-answers.yml

@@ -1,5 +1,5 @@
 # Do NOT update manually; changes here will be overwritten by Copier
-_commit: v1.14.1
+_commit: v1.14.2
 _src_path: gh:oca/oca-addons-repo-template
 ci: GitHub
 dependency_installation_mode: PIP

README.md

@@ -21,14 +21,20 @@ Available addons
 ----------------
 addon | version | maintainers | summary
 --- | --- | --- | ---
-[hr_expense_advance_clearing](hr_expense_advance_clearing/) | 15.0.1.0.1 | [![kittiu](https://github.com/kittiu.png?size=30px)](https://github.com/kittiu) | Employee Advance and Clearing
-[hr_expense_cancel](hr_expense_cancel/) | 15.0.1.0.0 |  | Hr expense cancel
+[hr_expense_advance_clearing](hr_expense_advance_clearing/) | 15.0.1.2.0 | [![kittiu](https://github.com/kittiu.png?size=30px)](https://github.com/kittiu) | Employee Advance and Clearing
+[hr_expense_advance_clearing_sequence](hr_expense_advance_clearing_sequence/) | 15.0.1.0.0 |  | HR Expense Advance Clearing Sequence
+[hr_expense_cancel](hr_expense_cancel/) | 15.0.1.0.1 |  | Hr expense cancel
 [hr_expense_exception](hr_expense_exception/) | 15.0.1.0.0 |  | Custom exceptions on expense report
-[hr_expense_invoice](hr_expense_invoice/) | 15.0.1.1.2 |  | Supplier invoices on HR expenses
-[hr_expense_payment](hr_expense_payment/) | 15.0.1.0.0 |  | HR Expense Payment
-[hr_expense_petty_cash](hr_expense_petty_cash/) | 15.0.1.0.0 |  | Petty Cash
+[hr_expense_invoice](hr_expense_invoice/) | 15.0.1.1.3 |  | Supplier invoices on HR expenses
+[hr_expense_pay_to_vendor](hr_expense_pay_to_vendor/) | 15.0.1.0.0 | [![kittiu](https://github.com/kittiu.png?size=30px)](https://github.com/kittiu) | HR Expense - Pay To Vendor
+[hr_expense_payment](hr_expense_payment/) | 15.0.1.0.1 |  | HR Expense Payment
+[hr_expense_payment_widget_amount](hr_expense_payment_widget_amount/) | 15.0.1.0.0 | [![Saran440](https://github.com/Saran440.png?size=30px)](https://github.com/Saran440) | HR Expense Payment Widget Amount
+[hr_expense_petty_cash](hr_expense_petty_cash/) | 15.0.1.1.0 |  | Petty Cash
 [hr_expense_portal](hr_expense_portal/) | 15.0.1.0.0 |  | Show current expense in a website.
 [hr_expense_sequence](hr_expense_sequence/) | 15.0.1.0.0 |  | HR expense sequence
+[hr_expense_tax_adjust](hr_expense_tax_adjust/) | 15.0.1.1.0 | [![ps-tubtim](https://github.com/ps-tubtim.png?size=30px)](https://github.com/ps-tubtim) | Allow to edit tax amount on expenses
+[hr_expense_tier_validation](hr_expense_tier_validation/) | 15.0.1.0.0 | [![ps-tubtim](https://github.com/ps-tubtim.png?size=30px)](https://github.com/ps-tubtim) | Expense Tier Validation
+[sale_expense_cost_reinvoice](sale_expense_cost_reinvoice/) | 15.0.1.0.0 | [![yankinmax](https://github.com/yankinmax.png?size=30px)](https://github.com/yankinmax) | Provide cost on order line when Auto Re-invoice at cost
 [sale_expense_manual_reinvoice](sale_expense_manual_reinvoice/) | 15.0.1.0.1 | [![ivantodorovich](https://github.com/ivantodorovich.png?size=30px)](https://github.com/ivantodorovich) | Allow to manually re-invoice expenses
 
 [//]: # (end addons)

hr_expense_advance_clearing/README.rst

@@ -2,10 +2,13 @@
 Employee Advance and Clearing
 =============================
 
-.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:3f86d32ea88a35bf634ff890883afa7eed74a9d596f50690ca541b95f506662f
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
@@ -19,11 +22,11 @@ Employee Advance and Clearing
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
     :target: https://translation.odoo-community.org/projects/hr-expense-15-0/hr-expense-15-0-hr_expense_advance_clearing
     :alt: Translate me on Weblate
-.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/289/15.0
-    :alt: Try me on Runbot
+.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/hr-expense&target_branch=15.0
+    :alt: Try me on Runboat
 
-|badge1| |badge2| |badge3| |badge4| |badge5| 
+|badge1| |badge2| |badge3| |badge4| |badge5|
 
 Standard Expenses module allow employee to do the expense reimbursement only after the expense has been made.
 In other world, employee will need to pay first and reimburse later.
@@ -59,25 +62,35 @@ Note:
 Usage
 =====
 
+To use this module, you must configure product "Employee Advance" with account type = Current Asset and check Allow Reconciliation.
+After that, you can step following:
+
 **Create an Employee Advance**
 
-#. Go to Expenses > My Expenses > My Expenses to Report
-#. Create a new Expense as normal, but also check "Employee Advance" checkbox
-#. Product = Employee Advance will be set automatically, do not change.
-#. As an option, user can also set the "Clearing Product". If this is set, on the clear advance step, the clearing product will create a default product line.
-#. Set the unit price to advance amount
-#. Click Create Report as normal. Please note that, this expense report will also has flag "Employee Advance" checked.
-#. As normal, do Approve > Post Journal Entries > Register Payment.
-#. As this is Advance, you will see new field "Amount to clear".
+#. Go to Expenses > My Expenses > Advances
+#. Create sheet and add a line with advance
+#. As an option, the user can also set the "Clearing Product". If this is set, on the clear advance step, the clearing product will create a default product line.
+#. Set the unit price to advance amount > Save
+#. As normal, do Submit to Manager > Approve > Post Journal Entries > Register Payment.
+#. As this is Advance, you will see a new field "Amount to clear".
 
 **Clear Advance**
 
-#. Go to Expenses > My Reports.
-#. Search for the Advance you want to clear, or use filter "Advance (not cleared)" to see all uncleared advance.
-#. Open an Advance which is now in paid status with some Amount to be cleared.
-#. Click button "Clear Advance", system will create new Expense Report with reference to the previous step Advance.
-#. Add or create Expense line(s) as normal.
-#. As normal, do Approve > Post Journal Entries
+you can do 2 ways,
+
+#. Create clearing from advance document
+    #. Go to Expenses > My Expenses > Advances
+    #. Search for the Advance you want to clear, or use filter "Advance (not cleared)" to see all uncleared advance.
+    #. Open an Advance which is now in paid status with some Amount to be cleared.
+    #. Click button "Clear Advance", system will create new Expense Report with reference to the previous step Advance.
+    #. Create name clearing and Save (must save first)
+    #. Edit > Add or create Expense line(s) as normal.
+    #. As normal, do Approve > Post Journal Entries
+#. Create clearing from new expense
+    #. Go to Expenses > My Expenses > Expenses
+    #. Create sheet and reference advance with field "Clear Advance" > Save (must save first)
+    #. Edit > Add or create Expense line(s) as normal.
+    #. As normal, do Approve > Post Journal Entries
 
 Note:
 
@@ -86,7 +99,7 @@ Note:
 
 **Return Advance**
 
-#. Go to Expenses > My Reports.
+#. Go to Expenses > My Expenses > Advances
 #. Search for the Advance you want to clear, or use filter "Advance (not cleared)" to see all uncleared advance.
 #. Open an Advance which is now in paid status with some Amount to be cleared.
 #. Click button "Return Advance" will open Register Payment wizard with Amount to clear.
@@ -98,7 +111,7 @@ Bug Tracker
 
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/hr-expense/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
-If you spotted it first, help us smashing it by providing a detailed and welcomed
+If you spotted it first, help us to smash it by providing a detailed and welcomed
 `feedback <https://github.com/OCA/hr-expense/issues/new?body=module:%20hr_expense_advance_clearing%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.

hr_expense_advance_clearing/__manifest__.py

@@ -3,7 +3,7 @@
 
 {
     "name": "Employee Advance and Clearing",
-    "version": "15.0.1.0.1",
+    "version": "15.0.1.2.0",
     "category": "Human Resources",
     "author": "Ecosoft, Odoo Community Association (OCA)",
     "license": "AGPL-3",