Nabin Hait 2ef1f84041 Fixed merge conflict

2018-02-03 09:14:53 +05:30

..

authorization_control

…

authorization_rule

…

brand

…

company

resolved merge conflicts

2018-01-29 16:25:33 +05:30

currency_exchange

Enhance Currency Exchange Management (#10482)

2017-09-21 14:50:39 +05:30

customer_group

Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date (#12685)

2018-01-29 16:07:21 +05:30

email_digest

[Fix] Wrong value showing in the email digest (#11840)

2017-12-04 13:36:01 +05:30

global_defaults

Post GL Entry based on rounded total in Sales/Purchase Invoice (#11542)

2017-11-17 12:27:43 +05:30

item_group

refactor adjust_for_expired_items and others as per code review

2018-01-31 10:51:06 +01:00

naming_series

Fixes in the naming series (#10480)

2017-08-24 17:51:23 +05:30

notification_control

…

party_type

[fix] do not allow user to create party type (#11706)

2017-11-23 18:02:51 +05:30

print_heading

…

quotation_lost_reason

…

sales_partner

link the address and contact with the sales partner (#11592)

2017-11-16 18:10:04 +05:30

sales_person

…

setup_progress

[progress] R/W permission for all roles (#10866)

2017-09-21 12:02:18 +05:30

setup_progress_action

Progress fixes (#10710)

2017-09-13 18:41:01 +05:30

supplier_type

add new field payment_terms to Supplier Type

2017-09-04 19:38:41 +01:00

target_detail

…

terms_and_conditions

…

territory

…

uom

…

website_item_group

…

__init__.py

…