4292 Commits

Author	SHA1	Message	Date
Frappe Bot	74fd5daeb2	Merge branch 'master' into develop	2019-02-15 10:22:33 +00:00
Nabin Hait	eb0627356b	Merge pull request #16650 from nabinhait/general-ledger-fix ... fix: show values in account/party currency based in actual entry, no conversion	2019-02-15 14:53:12 +05:30
Nabin Hait	4df7679c65	fix: Get outstanding invoices	2019-02-15 13:08:04 +05:30
Nabin Hait	c3698e458f	Merge pull request #16666 from nabinhait/deferred-revenue-fix ... fix: errors in deferred revenue booking	2019-02-14 18:49:01 +05:30
Nabin Hait	1c6a1dd5c0	Merge branch 'hotfix' into general-ledger-fix	2019-02-14 18:37:40 +05:30
Nabin Hait	29fcb14c42	fix: errors in deferred revenue booking	2019-02-13 17:18:12 +05:30
Sagar Vora	551f52fd25	Merge branch 'master' into develop	2019-02-12 16:41:24 +05:30
Nabin Hait	6447069e50	fix: show values in account/party currency based in actual entry, no conversion	2019-02-12 16:41:20 +05:30
Nabin Hait	fdefbdb23b	Merge pull request #16609 from nabinhait/multipel_fixes ... Multiple fixes	2019-02-12 13:56:06 +05:30
Nabin Hait	ab50211e18	fix: show project even if PI is directly created	2019-02-11 18:25:18 +05:30
Nabin Hait	e3b0f4f9f6	fix: removed account type filter on employee advance account	2019-02-08 16:56:26 +05:30
Nabin Hait	27af6b377f	fix: defered accounting fixes	2019-02-08 16:56:26 +05:30
Aditya Hase	2a3c39f38a	fix(py3): Convert dict.values() to list for indexing	2019-02-08 12:02:57 +05:30
Aditya Hase	46d7456782	fix(py3): Convert list to filter for indexing	2019-02-08 12:02:14 +05:30
Aditya Hase	a86a569787	fix(py3): Convert dict.values() to list for indexing	2019-02-07 22:21:06 +05:30
Aditya Hase	3e954734d0	fix(py3): Convert filter to list for indexing	2019-02-07 22:21:05 +05:30
Aditya Hase	0b1dc32fcb	Merge pull request #16597 from adityahase/python3-fix ... fix(py3): Use range instead of xrange	2019-02-07 18:17:37 +05:30
Aditya Hase	b9dc031e86	fix(py3): Use range instead of xrange	2019-02-07 18:10:30 +05:30
Prateeksha Singh	ce27cffaad	refactor(desk_icon): Remove reference and patches to Desktop Icon	2019-02-07 09:58:21 +05:30
Sagar Vora	da1dc7fa52	Merge branch 'master' into develop	2019-02-05 18:40:39 +05:30
Nabin Hait	7b93e738ad	Merge pull request #16576 from nabinhait/pay_reco_fix ... fix: Optimising payment reconciliation queries	2019-02-05 10:28:03 +05:30
Nabin Hait	ac18498ca5	fix: Optimising payment reconciliation queries	2019-02-04 21:13:43 +05:30
Chinmay Pai	125505f2aa	fix(purchase_invoice): fix undefined variable ... fixes issue while creating purchase invoice Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-04 16:30:20 +05:30
Saif Ur Rehman	1a441b267d	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 ... # Conflicts: # erpnext/patches.txt	2019-02-01 19:17:04 +05:00
Sagar Vora	56cbfe4bb0	Merge branch 'master' into develop	2019-01-31 13:34:32 +05:30
Aditya Hase	66833f109b	fix(accounts): fetch subscription details only if required fields are populated	2019-01-30 19:40:40 +05:30
Sagar Vora	f97c5dad82	Merge branch 'staging' into develop	2019-01-29 18:39:14 +05:30
Sagar Vora	f3cfad7595	Merge branch 'master' into staging-fixes	2019-01-29 17:20:46 +05:30
rohitwaghchaure	a95ed44d3d	fix: test case for fiscal year (#16516)	2019-01-29 16:24:53 +05:30
Nabin Hait	cc41b876fb	Merge pull request #16497 from nabinhait/bom_price ... BOM raw materials price	2019-01-29 14:58:40 +05:30
Sagar Vora	8f6509fa9a	Merge branch 'staging-fixes' into fiscal_year_should_always_be_for_12_months	2019-01-29 13:04:20 +05:30
Sagar Vora	9520e345bd	fix: better error messages	2019-01-29 13:03:46 +05:30
Nabin Hait	1df9a23e7b	Merge pull request #16513 from rohitwaghchaure/remove_zero_qty_items_on_click_os_pay ... feat: on click of pay button and on focus out of qty field remove the zero qty items from the cart	2019-01-29 13:02:56 +05:30
Rohit Waghchaure	07f75a3e54	feat: on click of pay button and on focus out of qty field remove the zero qty items from the cart	2019-01-29 13:00:18 +05:30
Rohit Waghchaure	a8e743e3c4	fix: fiscal year always be for 12 months	2019-01-29 12:55:04 +05:30
Deepesh Garg	a8cc4b105d	Merge branch 'staging-fixes' into pos_issue	2019-01-29 11:29:41 +05:30
Nabin Hait	3b8623e207	Merge pull request #16491 from adityahase/ar-fix ... fix(ar-summary): Changes to column list to match recent changes	2019-01-29 11:28:02 +05:30
Nabin Hait	ff2922cbbb	Merge pull request #16488 from deepeshgarg007/price_list ... fix(sales_invoice): fetch customer price list if available before pos price list	2019-01-29 11:24:22 +05:30
Nabin Hait	e8190473f5	Merge branch 'staging-fixes' into unicode	2019-01-29 11:13:04 +05:30
deepeshgarg007	f0cfe98860	fix: Added missing semicolon and removed null from parameter	2019-01-28 17:58:44 +05:30
deepeshgarg007	4e4b200972	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into pos_issue	2019-01-27 22:54:34 +05:30
deepeshgarg007	c2ffcc5e71	feat(POS): Customer wise price list in offline mode and enhancement in POS closing voucher	2019-01-27 16:09:07 +05:30
deepeshgarg007	76556e1a3e	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into price_list	2019-01-25 16:50:06 +05:30
deepeshgarg007	8c84b7b888	fix: Doctype Name correction	2019-01-25 16:44:45 +05:30
Nabin Hait	3476a457ad	fix: minor	2019-01-25 16:22:36 +05:30
deepeshgarg007	1f9a6febdd	fix: Assign given price list if POS price list is not available	2019-01-25 11:53:55 +05:30
Nabin Hait	596c1b3489	Merge pull request #16220 from SaiFi0102/Party-Ledger-Summary ... feat: Party Ledger Summary Report	2019-01-25 11:22:55 +05:30
Nabin Hait	e21bdf020c	Merge pull request #16472 from deepeshgarg007/cost_center ... fix(cost_center): Bug fix in update_cost_center_number argument name	2019-01-25 09:56:52 +05:30
Nabin Hait	a6ab38665d	Merge pull request #16487 from netchampfaris/fix-gst-pos-invoice ... fix: Dont show 0 amount taxes and tax breakup	2019-01-25 09:54:07 +05:30
Nabin Hait	393080ecbe	Merge pull request #16492 from rohitwaghchaure/ascii_code_issue_pos_offline_not_working ... fix: ascii codec while opening offline POS	2019-01-25 09:50:41 +05:30