Commit Graph

21781 Commits

Author SHA1 Message Date
Achilles Rasquinha
1697a7aa81 replaced string_types with basestring 2018-02-15 11:39:45 +05:30
Achilles Rasquinha
714c7465fb Updated Python 3 fixes 2018-02-15 11:31:05 +05:30
Shreya Shah
8b531c1ee6 Fix parenthesis in buying controller (#12923) 2018-02-15 11:21:49 +05:30
Prateeksha Singh
387a242232
Merge pull request #12928 from pratu16x7/hub-pages
Hub pages
2018-02-15 11:05:22 +05:30
Prateeksha Singh
9889899603 [hub] cleanups 2018-02-15 10:54:23 +05:30
Prateeksha Singh
1ad072f2a9 [hub] cleanups 2018-02-15 10:47:59 +05:30
Prateeksha Singh
2073959bb8 Update entity properties 2018-02-15 10:24:16 +05:30
Prateeksha Singh
6ee035ba5b tree parent working 2018-02-15 08:50:31 +05:30
Faris Ansari
1e422f2383 Patch to enable translatable 2018-02-14 22:18:55 +05:30
Prateeksha Singh
25d5a1d890 add company pages 2018-02-14 19:53:18 +05:30
Achilles Rasquinha
806a18b511 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2018-02-14 19:40:43 +05:30
Nabin Hait
e6d65bc2a1
Fixed translations and tests (#12900)
* Fixed translations and tests

* minor fixes

* minor test fixes
2018-02-14 17:44:06 +05:30
Achilles Rasquinha
361366ebe6 Python 3 fixes. (#12916)
* Fixed iteritems and exceptions

* python3-fixes

* fixed iteritems
2018-02-14 17:08:59 +05:30
rohitwaghchaure
a13b177908 [Fix] Not able to select delivery note in delivery trip (#12912) 2018-02-14 17:06:21 +05:30
Prateeksha Singh
8e84fa9f9e
Merge pull request #12914 from achillesrasquinha/company-logo
Added Company Logo to DocType
2018-02-14 17:04:47 +05:30
Achilles Rasquinha
4b847f7897 fixed iteritems 2018-02-14 16:44:58 +05:30
Achilles Rasquinha
c67b1258dd python3-fixes 2018-02-14 16:14:52 +05:30
Achilles Rasquinha
b723033213 python3-fixes 2018-02-14 16:13:37 +05:30
Achilles Rasquinha
1c86d18837 Added Hub Company Logo 2018-02-14 16:05:32 +05:30
PrakashH
908af53fcd Update stock-reconciliation-for-non-serialized-item.md (#12908) 2018-02-14 13:16:25 +05:30
PrakashH
0c4c2981c8 Update journal-entry.md (#12909) 2018-02-14 13:15:53 +05:30
Saurabh
2735701aab resolved merge conflicts 2018-02-14 11:51:09 +05:30
Saurabh
0500ce445f Merge branch 'hotfix' 2018-02-14 11:45:31 +05:30
Saurabh
351dc08576 bumped to version 10.0.22 2018-02-14 12:15:31 +06:00
Achilles Rasquinha
5cf536b39d Fixed iteritems and exceptions 2018-02-13 19:05:54 +05:30
Manas Solanki
ab70b53948 Delete .swp (#12894)
* Delete .swp

* updated gitignore to exclude temp vim files
2018-02-13 18:27:02 +05:30
rohitwaghchaure
8e675ebbe2 [Fix] Price list exchange rate is not visible when base currency and price list currency is different (#12898) 2018-02-13 17:11:06 +05:30
Faris Ansari
d53b149828 [deadlock fix] Save if not set (#12896) 2018-02-13 16:31:00 +05:30
Faris Ansari
5a91989665 Remove total_projected_qty (#12889) 2018-02-13 16:00:52 +05:30
Nabin Hait
bb821ec2af Fixed test dependencies 2018-02-13 14:49:09 +05:30
rohitwaghchaure
62d6593fe7 [Fix] Allow to make disbursement entry even if payment account in not set in the employee loan (#12882) 2018-02-13 14:43:37 +05:30
Achilles Rasquinha
56b2e12af8 Python 3 fixes [merge asap] (#12884)
* Python 3 fixes

* fixed compare
2018-02-13 14:42:40 +05:30
saurabh-bhosale
ed35a296ab closes #12872 (#12888) 2018-02-13 14:40:59 +05:30
Prateeksha Singh
ecc6f86c7c
Merge pull request #12885 from netchampfaris/setup-progress-deadlock-fix
[deadlock fix] Save if not set
2018-02-13 13:16:37 +05:30
Faris Ansari
f0056f7338 [deadlock fix] Save if not set 2018-02-13 12:18:24 +05:30
saurabh-bhosale
99eb30242d [Fix] Bug fix in customer_primary_address frappe call (#12880) 2018-02-13 07:58:47 +05:30
pawan
471a018e67 remove old stock entry method/rewrite test case 2018-02-12 21:15:46 +05:30
Nabin Hait
b005950ba7 Merge branch 'mntechnique-show_address_in_online_pos' into develop 2018-02-12 19:25:27 +05:30
Nabin Hait
662b23ce57 get address display in customer 2018-02-12 19:25:00 +05:30
Nabin Hait
4adcced9ae Merge branch 'show_address_in_online_pos' of https://github.com/mntechnique/erpnext into mntechnique-show_address_in_online_pos 2018-02-12 19:14:38 +05:30
rohitwaghchaure
6a7495dbc8 Removed set only once for maintain stock field in item master (#12878) 2018-02-12 17:25:24 +05:30
sivankar
a4ff220769 removed duplicate function and other CLI fixes (#12876)
* merge shelf like and manufacturing date

* setting default manufacturing date as todays date

* setting default manufacturing date as todays date

* fix

* Improvements to batch auto naming (#12496)

* refactor:
add new function - batch_uses_naming_series
use batch_uses_naming_series in autoname method

* properly update naming series on delete:
- add new functions - get_batch_prefix, get_batch_naming_series_key, get_batch_naming_series
- refactor get_name_from_naming_series
- add after_delete method

* add documentation and rename some functions

* PEP 8 compliance

* test

* added support for jinja template and added validation if expiry date is set or not if item has_expiry_date is set

* bug fix, renamed item_code to item as in batch doctype we refer 'item code' by 'item'

* added manufacturing date wise sort

* added prefix to expiry date and manufacturing date

* Quality Review fixes
2018-02-12 17:24:26 +05:30
pawan
1b8c13b175 call make_rm_stock_entry 2018-02-12 16:59:59 +05:30
Nabin Hait
a8d10b7332
Update setup.py 2018-02-12 16:54:13 +05:30
Shreya Shah
d9a585bdad Leave workflow patch fixes (#12823)
* modified patch for leave application workflow

* removed leave approval field from leave application doctype

* fetch lwp and attendance only if workflow field exists

* modified test cases

* modified files with leave application

* docstatus draft for rejected applications

* modified leave application calendar

* test fixed

* run patch only if any record exists
2018-02-12 16:02:57 +05:30
Nabin Hait
c69f4c0c79 Merge branch 'joezsweet-multi-barcode' into develop 2018-02-12 16:00:56 +05:30
Nabin Hait
e21e59614f Fixed merge conflict 2018-02-12 15:59:55 +05:30
tundebabzy
6e90f49a35 Wrong Exchange Rate Is Fetched When Exchange Rate Is Different From Company Currency For Price Lists #12712 (#12714)
* unconditionally fetch exchange rate

* Revert "unconditionally fetch exchange rate"

This reverts commit d0d404d342092b5ba4398ed3bd8d8ff8f60b5f8a.

* allow for `plc_conversion_rate` field to be reset

* fetch exchange rate using price list currency and company currency not form currency

* clean up
2018-02-12 15:18:57 +05:30
tundebabzy
c89782502c Report presentation currency (#12670)
* Add new Select to filters

* get the currencies from database rather than hardcoded

* label report columns:
- If presentation currency is available in filters, use it or
- If company is available in filters, use it or
- use default company currency

* add new function - get_currency

* tweak new function `get_currency`

* add new function `convert` to convert a value to another currency

* add new function `convert_to_presentation_currency`

* clean up `get_currency` first pass

* memoise the exchange rates

* limit fetched GL entries to to_date

* check if account type is p&l or not and use appropriate exchange rate based on that

* change EXCHANGE RATE to a dict, use for memoisation

* rename EXCHANGE_RATE

* cache exchange rates and use them as needed

* add docstrings

* add presentation currency logic to financial statement reports

* move new functions from `general_ledger.py` to new module

* clean up

* PEP 8 clean up

* move function to util.py

* PEP 8 clean up

* remove presentation currency option from cashflow

* adjust currency as needed

* allow users to save presentation currency in Accounts Settings

* add new function `get_presentation_currency_list`

* refactor query_report modules with no promises

* Revert "allow users to save presentation currency in Accounts Settings"

This reverts commit 3b58a6296cf3f7b4d80ac55b03f9d5d4887b796b.

* show print page in correct currency

* Update utils.py
2018-02-12 15:04:50 +05:30
joezsweet
04338cfb4b
removed extra spaces 2018-02-12 10:12:27 +01:00