Nabin Hait
2d76825936
remove toggling SO and DN field in SI based on pos
2015-05-12 15:24:55 +05:30
Nabin Hait
4b9b92ba2f
minor fix in report
2015-05-12 15:12:30 +05:30
Nabin Hait
ffc7f3fef6
Apply default taxes on loading of document
2015-05-12 15:07:02 +05:30
Rushabh Mehta
ab1ed013b3
[hot] taxes
2015-05-08 11:09:25 +05:30
Rushabh Mehta
bcdea3ea51
[rename] Sales/Purchase Taxes and Charges Master > Sales/Purchase Taxes and Charges Template
2015-05-06 18:45:47 +05:30
Nabin Hait
a0b1124d6f
minor fix in report
2015-05-06 11:59:43 +05:30
Rushabh Mehta
4f41bb35b9
Merge pull request #3192 from neilLasrado/purchase-costing
...
Purchase costing in Projects
2015-05-05 10:59:11 +05:30
Nabin Hait
ba43afc461
fix in chart of cost centers
2015-05-01 16:41:15 +05:30
Nabin Hait
2ca18ff913
Stock Entry validation in Journal Entry
2015-05-01 12:46:59 +05:30
Rushabh Mehta
5dbf8a7418
[cleanup] frappe.get_user
2015-05-01 11:51:26 +05:30
Anand Doshi
e6ac87e86f
Gross Profit Report: Company filter should be reqd
2015-04-30 15:33:31 -07:00
Neil Trini Lasrado
42a554e5cb
fixes in Purchase Invoice
2015-04-30 13:06:02 +05:30
Neil Trini Lasrado
01720404db
fixes in Test Cases
2015-04-30 13:06:02 +05:30
Neil Trini Lasrado
349461e9e6
Test Cases Added
2015-04-30 13:06:02 +05:30
Neil Trini Lasrado
9a56764bf2
Total Purchase Cost added to Projects
2015-04-30 13:06:02 +05:30
Nabin Hait
4716278f69
minor fix in chart of cost centers
2015-04-29 19:12:46 +05:30
Nabin Hait
2db8dc922a
fixed trial balance related to showing zero balance
2015-04-29 18:39:33 +05:30
Nabin Hait
6e59aca394
[enhancement] sort root accounts as assets, liability, equity, income, expense
2015-04-29 13:08:00 +05:30
Nabin Hait
59ab65ded6
fixed trial balance related to showing zero balance
2015-04-29 13:08:00 +05:30
Rushabh Mehta
0590cdceab
[enhancement] sort root accounts as assets, liability, equty, income, expense
2015-04-29 12:26:15 +05:30
Nabin Hait
081935eff7
[fix] fetch bank/cash account
2015-04-28 19:08:42 +05:30
Nabin Hait
2ff177a4fb
fix for opening purchase invoice
2015-04-28 17:17:37 +05:30
Nabin Hait
47e5c764c3
[fix] accounts payable report
2015-04-28 16:45:32 +05:30
Nabin Hait
b1b95526c6
Update sales_invoice.js
2015-04-28 13:56:48 +05:30
Nabin Hait
872eaf1541
Update purchase_invoice.js
2015-04-28 13:56:17 +05:30
Nabin Hait
aef76bfa1d
Update journal_entry.js
2015-04-28 13:55:04 +05:30
Nabin Hait
5616ff417c
Account type Temporary and removed Aging Date field from all documents
2015-04-27 18:08:51 +05:30
Rushabh Mehta
50ce9753e0
[minor] added cache in get_value
2015-04-27 13:13:50 +05:30
Rushabh Mehta
6894b9e457
[minor] only one Temporary Opening account
2015-04-24 14:22:54 +05:30
Nabin Hait
01e4c8f0f8
fix in chart of accounts
2015-04-23 16:29:15 +05:30
Rushabh Mehta
38c6b52770
[rename] group_or_ledger to is_group
2015-04-23 13:14:17 +05:30
Nabin Hait
b650d691a0
fixed conflict
2015-04-21 17:16:28 +05:30
Rushabh Mehta
50918a8fcf
[pos] fixes #3138 , #3140
2015-04-21 14:38:48 +05:30
Rushabh Mehta
80381475c4
[ux] re-arranged columns in bank reconciliation, fixes #3114
2015-04-21 11:08:53 +05:30
Rushabh Mehta
dfa93305ab
[minor] fixes #3127
2015-04-21 10:36:39 +05:30
Nabin Hait
5c7f0bcb32
Party filter and columns in general ledger report
2015-04-20 17:13:53 +05:30
Nabin Hait
44aaa56000
get standard chart of account if country code not found
2015-04-20 11:51:54 +05:30
Rushabh Mehta
d7330ec709
[minor] add disabled property in fiscal year:
2015-04-18 17:04:04 +05:30
Rushabh Mehta
92b253dceb
Update accounts_receivable.py
2015-04-18 12:13:57 +05:30
Nabin Hait
4743cbe002
issue fixed in accounts receivable report
2015-04-17 15:55:19 +05:30
Rushabh Mehta
9e6812cfab
Merge pull request #3108 from BhupeshGupta/fix_bank_reports
...
Add/Fix Bank Reports Filters
2015-04-17 14:17:22 +05:30
Nabin Hait
1a6299176a
delete gl entries on cancellation of sales invoice, if grand total is zero
2015-04-16 19:22:42 +05:30
Nabin Hait
2182cd5487
Update journal_entry.js
2015-04-16 16:00:37 +05:30
Rushabh Mehta
acf489c5ef
[hot] [fix] journal entry
2015-04-16 15:35:49 +05:30
Rushabh Mehta
d839a730cf
[hot] [fix] journal entry
2015-04-16 15:27:46 +05:30
Rushabh Mehta
600aa622b1
[fix] [minor] journal entry, via error report
2015-04-16 11:43:26 +05:30
Rushabh Mehta
12ade3573b
[minor] fix default permissions for purchase taxes and charges master
2015-04-16 11:43:25 +05:30
bhupeshg2
3f59615555
switch to tabs
2015-04-15 22:29:45 +05:30
Rushabh Mehta
e027d3f34f
[fix] a better solution for #2776
2015-04-15 12:03:21 +05:30
bhupeshg2
e2e973f7be
Add reqd to bank clearance aummary report
...
Add filters if filters are in list form to get_account_list [erpnext.controllers.queries.get_account_list] query
2015-04-14 23:09:32 +05:30
Anand Doshi
68dfc934bf
[hotfix] [report] Received Items to be Billed
2015-04-14 11:56:42 -04:00
Rushabh Mehta
de9bd108d0
[usability] journal entry type fixes #3085
2015-04-14 14:10:19 +05:30
Rushabh Mehta
20bcf6aeff
[fixes] print_hide on stock uom and gross profit
2015-04-13 15:31:24 +05:30
Rushabh Mehta
39c84fe31c
[hot] coa
2015-04-13 12:16:25 +05:30
Rushabh Mehta
b4c4351513
[report] fix via error report
2015-04-13 11:30:10 +05:30
Anand Doshi
c994647704
fixed test cases
2015-04-08 21:22:36 +05:30
Anand Doshi
c399709789
fixes to test cases
2015-04-06 19:29:16 +05:30
Anand Doshi
0dc79f4de0
Merge remote-tracking branch 'frappe/v4.x.x' into develop
...
Conflicts:
.travis.yml
erpnext/__version__.py
erpnext/controllers/queries.py
erpnext/hooks.py
erpnext/selling/sales_common.js
erpnext/stock/doctype/bin/bin.py
erpnext/stock/doctype/stock_entry/stock_entry.js
erpnext/stock/doctype/stock_entry/stock_entry.py
erpnext/stock/stock_ledger.py
setup.py
2015-04-06 13:21:07 +05:30
Anand Doshi
c13c4f014e
[fix] editable amount in Purchase Taxes and Charges
2015-04-03 14:55:51 +05:30
Rushabh Mehta
f63a3d4a80
[fiscal year] automatically set year end date if more than one year
2015-04-03 10:59:48 +05:30
Anand Doshi
83f87da3d1
Show Write-Off for all Sales Invoices if there is a Grand Total
2015-04-02 13:43:51 +05:30
Rushabh Mehta
d7a5b7309b
[minor] fix
2015-04-01 23:38:37 +05:30
Anand Doshi
8ea1ed143b
Show write-off section if pos or advance payment
2015-04-01 16:25:55 +05:30
Anand Doshi
dd77287cb9
[fix] fiscal year auto-create
2015-04-01 08:26:32 +05:30
Anand Doshi
6208c49859
Added Company field in various Query Reports
2015-03-30 15:21:20 +05:30
Nabin Hait
7057970c0c
purchase order items to be billed report
2015-03-26 11:05:13 +05:30
Rushabh Mehta
eb928b950f
[fix] journal entry 3 cols, default weekly digest
2015-03-25 17:34:20 +05:30
Nabin Hait
a3eec1603a
fixed against jv query
2015-03-24 14:49:09 +05:30
Nabin Hait
53450b08b0
Fixes in general ledger report
2015-03-24 13:13:25 +05:30
Nabin Hait
d2af60c825
Root Equity added in standard chart of accounts and finalized chart of India And UAE
2015-03-23 16:08:32 +05:30
Nabin Hait
da5cfb1630
Exchange rate upto 9 decimals
2015-03-23 14:51:45 +05:30
Nabin Hait
ca7e778f82
modified date updated
2015-03-23 14:17:59 +05:30
Nabin Hait
2df422de25
Test case fixes
2015-03-18 14:57:09 +05:30
Nabin Hait
a1bf43b1a6
Merged develop into v5
2015-03-17 10:50:47 +05:30
Nabin Hait
d3fd8965de
test case fixed
2015-03-17 10:15:19 +05:30
Anand Doshi
9d9e31f4e8
moved get_list_context to module
2015-03-13 12:48:05 +05:30
Nabin Hait
7c9d003917
Test case cleanup and fixes
2015-03-13 08:14:46 +05:30
Nabin Hait
c8c1d1c693
Test case fixes
2015-03-13 08:14:45 +05:30
Sambhaji Kolate
98dbccd1d6
added actual_batch_qty at warehouse in DN & SI #1873
2015-03-10 15:04:28 +05:30
Rushabh Mehta
f5f0d5a83a
[breadcrumbs] refactor
2015-03-09 15:48:16 +05:30
Nabin Hait
081c3ec476
c-form message issue
2015-03-09 15:11:34 +05:30
Anand Doshi
c0eb8c0de3
Fixed some Stock Entry test cases
2015-03-08 12:42:18 +05:30
Anand Doshi
1119fb4c00
Fixed Sales Invoice test cases
2015-03-06 20:50:51 +05:30
Anand Doshi
ec5ec60764
Fixed Test Cases
2015-03-05 19:31:40 +05:30
Rushabh Mehta
06a6bcce17
[fixes] pos, chart of accounts
2015-03-05 16:38:43 +05:30
Rushabh Mehta
c4dce99f4b
[fixes] pos #2830 , #2795
2015-03-05 15:09:04 +05:30
Nabin Hait
b50833a1e8
Fields alignment
2015-03-04 16:14:02 +05:30
Nabin Hait
95ff2d4fed
discount loss adjustment in base currency
2015-03-04 16:02:21 +05:30
Rushabh Mehta
2cc585f180
[git fixes] salary manager, time log title, notificaitons
2015-03-03 16:06:54 +05:30
Rushabh Mehta
e693f794f5
[subcontract] refactor, make stock entry from PO
2015-03-03 15:50:24 +05:30
Nabin Hait
49ecbd7353
Sales invoice query in journal entry
2015-03-03 15:48:33 +05:30
Anand Doshi
885e074697
Changed company name from Web Notes to Frappe Technologies
2015-03-03 14:56:43 +05:30
Nabin Hait
c7aba3331b
verified chart of accounts
2015-03-03 14:07:21 +05:30
Rushabh Mehta
b83fa3bc2d
[pos] [barcode] fixes #2831
2015-03-02 18:25:14 +05:30
Nabin Hait
ad7ece63fe
Update sales_invoice.py
2015-02-27 22:45:28 +05:30
Anand Doshi
5bd8cfd9fe
[fix] queries
2015-02-26 12:40:58 +05:30
Nabin Hait
851c745fdf
Merge branch 'develop' of https://github.com/frappe/erpnext into v5.0
2015-02-26 12:32:04 +05:30
Nabin Hait
836f9f34e4
warehouse mandatory in sales invoice if update_stock
2015-02-26 11:40:20 +05:30
Nabin Hait
79ffc2b3a7
fix in financial statements
2015-02-25 18:32:25 +05:30
Rushabh Mehta
2a21bc9fc2
[taxes and charges] refactor
2015-02-25 15:08:57 +05:30
Anand Doshi
d35354cc06
Merge remote-tracking branch 'frappe/develop' into v5.0
...
Conflicts:
erpnext/__version__.py
erpnext/accounts/doctype/budget_distribution/test_budget_distribution.py
erpnext/accounts/doctype/chart_of_accounts/charts/account_properties.py
erpnext/hooks.py
erpnext/patches.txt
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
erpnext/stock/get_item_details.py
erpnext/translations/ar.csv
erpnext/translations/bs.csv
erpnext/translations/ca.csv
erpnext/translations/el.csv
erpnext/translations/es.csv
erpnext/translations/fr.csv
erpnext/translations/hr.csv
erpnext/translations/id.csv
erpnext/translations/is.csv
erpnext/translations/ja.csv
erpnext/translations/nl.csv
erpnext/translations/pl.csv
erpnext/translations/pt-BR.csv
erpnext/translations/ru.csv
erpnext/translations/tr.csv
erpnext/translations/zh-cn.csv
erpnext/translations/zh-tw.csv
setup.py
2015-02-24 18:12:17 +05:30
Nabin Hait
7ce2f55ca9
print_hide for total_taxes_and_charges in buying
2015-02-24 16:06:14 +05:30
Nabin Hait
903c42a130
multiplefixes
2015-02-24 15:24:49 +05:30
Anand Doshi
d57e793bf3
[fix] Added unicode_literals if missing in py files
2015-02-24 12:24:53 +05:30
Nabin Hait
82e3e25cdb
fixes for base_rate, base_amount, tax_amount: mass search and replace
2015-02-24 10:02:28 +05:30
Nabin Hait
37b047d9a8
Fields added in all sales and purchase doctypes
2015-02-24 10:02:28 +05:30
Nabin Hait
613d081a60
Validate taxes and charges input, commonified
2015-02-24 10:02:28 +05:30
Nabin Hait
ce24512ed7
Commonified sales/purchase taxes and charges master.js code
2015-02-24 10:02:27 +05:30
Nabin Hait
e7679703cf
Taxes and totals calculation in party currency
2015-02-24 10:02:27 +05:30
Anand Doshi
f9fc04ce8e
Website Listing
2015-02-23 22:34:27 +05:30
Rushabh Mehta
a1da88a3d3
[capacity planning] automatically plan Time Logs from Production Order
2015-02-23 20:18:38 +05:30
Rushabh Mehta
d54031f3b5
[tests] [projects] merged tasks and projects and added quick edit of tasks from projects
2015-02-22 22:32:39 +05:30
Rushabh Mehta
364054a6fc
[fix] payment tool #2791
2015-02-21 14:39:35 +05:30
Rushabh Mehta
e8a37949cf
[issue fixes] + added fixtures for item attribute and operation
2015-02-20 20:10:11 +05:30
Rushabh Mehta
813f0eda05
[form] section labels
2015-02-20 16:02:48 +05:30
Rushabh Mehta
d51a47155b
[fixed] #2614
2015-02-20 10:39:39 +05:30
Rushabh Mehta
d60acb9f26
[fixes] production, added qty transferred, fix gantt, fiscal year (set fiscal year, instead of validation
2015-02-19 14:53:31 +05:30
Rushabh Mehta
614e7ab757
[cleanup] SMS, and added item filter in stock balance
2015-02-18 19:51:48 +05:30
Nabin Hait
fe81da2dd1
listview indicator fix
2015-02-18 12:23:18 +05:30
Nabin Hait
da5f766dd5
fixed conflict
2015-02-18 11:55:13 +05:30
Anand Doshi
8c0f05fbae
[minor] grid report loading
2015-02-17 19:53:23 +05:30
Anand Doshi
a6c361c00e
Setup Wizard: Load number format based on currency #2627 , login as first user on setup complete
2015-02-17 15:56:31 +05:30
Nabin Hait
cdb8e374e3
Merge pull request #2727 from neilLasrado/voucher-type
...
journal entry - accounts table cannot be blank - validation added
2015-02-17 14:07:44 +05:30
Nabin Hait
6f0a3ed8d4
fixed conflict
2015-02-17 11:12:04 +05:30
Anand Doshi
c82331bc19
[design] Setup Wizard
2015-02-12 20:02:17 +05:30
Nabin Hait
5690be103c
Replaced renamed total fields in code files
2015-02-12 16:09:11 +05:30
Nabin Hait
dd1c2d3018
Merge branch 'v5.0' of https://github.com/frappe/erpnext into foreign_currency_calc
2015-02-12 13:31:48 +05:30
Nabin Hait
4a149c0791
Chart of accounts cleanup for Nicaragua
2015-02-12 12:39:32 +05:30
Nabin Hait
461ee2ebae
Renamed total fields
2015-02-12 11:47:45 +05:30
Nabin Hait
0c0749a884
Merge pull request #2721 from williamjmorenor/v5.0
...
Add chart of accounts template for Nicaragua
2015-02-12 11:46:43 +05:30
William Moreno
5b72e21186
Final Fixing
...
I will no make other changes, please can chech the JSON
2015-02-11 16:57:43 -06:00
William Moreno
a05e6df3f5
Minor Fix
2015-02-11 15:48:41 -06:00
William Moreno
dab1db9874
Minor Fix
2015-02-11 15:43:40 -06:00
William Moreno
8e5e414276
Minor fix
2015-02-11 15:38:27 -06:00
William Moreno
92774e4743
Minor fix
2015-02-11 15:36:14 -06:00
William Moreno
c2037c5444
Add root_type and account_type
2015-02-11 15:06:58 -06:00
William Moreno
0a582ec885
Validate JSON
2015-02-11 12:41:11 -06:00
William Moreno
df023bd8ad
Best accounts tax details
2015-02-11 12:38:51 -06:00
William Moreno
f2bf17f2e2
Best IFRS for SMES compatibility
2015-02-11 12:06:40 -06:00
William Moreno
43d39f8e4d
Best IFRS for SMES compatibility
2015-02-11 11:57:22 -06:00
William Moreno
6b34bca7d0
Best IFRS for SMES compatibility
2015-02-11 11:53:45 -06:00
William Moreno
6fd091d979
Rearrange accounts to improve readability
2015-02-11 09:36:03 -06:00
William Moreno
7d7113328d
Change Style => TITLE to Title
2015-02-11 09:22:55 -06:00
William Moreno
1caea2ebae
Fix missing Comma (,)
...
Yes, I did not validate the last edit to the JSON before commit, sorry
2015-02-11 07:39:23 -06:00
Neil Trini Lasrado
802d717a9e
fixes
2015-02-11 17:27:58 +05:30
Neil Trini Lasrado
934d63de16
journal entry - accounts table cannot be blank - validation added
2015-02-11 17:05:41 +05:30
Nabin Hait
7945712171
Merge branch 'v5.0' of https://github.com/frappe/erpnext into foreign_currency_calc
2015-02-11 12:55:10 +05:30
William Moreno
ad45007362
Add chart of accounts template for Nicaragua
...
On branch v5.0
new file: erpnext/accounts/doctype/account/chart_of_accounts/ni_ni_chart_template.json
2015-02-10 23:57:24 -06:00
Nabin Hait
8fa503e177
Fixed conflict while merging v4 into v5
2015-02-10 16:44:00 +05:30
Nabin Hait
15cd12214e
Fixed conflict while merging v4 into v5
2015-02-10 16:37:18 +05:30
Anand Doshi
6dfd430a2f
Moved flags like ignore_mandatory, ignore_validate etc to doc.flags
2015-02-10 14:41:27 +05:30
Rushabh Mehta
a232c80d77
[share] add share permission
2015-02-05 15:52:58 +05:30
Anand Doshi
dd942bb3d2
[minor] fixed update item name in bom patch, removed filter from sales invoice list, show tax calculation only if tax exists
2015-02-04 18:53:24 +05:30
Nabin Hait
1dc8ff5220
item-wise tax distribution if amount entered in actual
2015-02-04 18:06:59 +05:30
Rushabh Mehta
0e13221338
[print] item tables - override description and uom
2015-02-04 17:02:24 +05:30
Nabin Hait
0c883500bb
Expense account query in purchase invoice
2015-02-03 17:59:00 +05:30
Rushabh Mehta
c567e8e960
[fix] analytics reports + remove print item tables #2667
2015-02-03 17:56:25 +05:30
Rushabh Mehta
06fa46fafe
[fix] onshow > on_page_show
2015-01-29 18:09:11 +05:30
Nabin Hait
538253e503
removed test files for purchase taxes and charges master
2015-01-23 17:47:44 +05:30
Nabin Hait
ecce5141eb
replaced budget distribution
2015-01-23 16:32:35 +05:30
Nabin Hait
b4a3dfa893
All the calculations in taxes_and_totals file
2015-01-22 17:13:13 +05:30
Nabin Hait
59de1e23bc
POS fix: setting discount amount
2015-01-21 17:50:28 +05:30
Nabin Hait
963393409e
minor fix: child table length
2015-01-21 17:22:11 +05:30
Nabin Hait
0a3e5653ba
bank reconciliation fix
2015-01-21 16:40:47 +05:30
Rushabh Mehta
81e972eac4
[cleanups]
2015-01-19 17:34:54 +05:30
Anand Doshi
f02e142d5d
[design] mobile
2015-01-19 15:59:45 +05:30
Anand Doshi
b942cb86ae
[minor] auto-create Fiscal Year, loading, general ledger
2015-01-19 15:59:45 +05:30
Nabin Hait
cff8993478
Merge pull request #2572 from neilLasrado/credit-note
...
journal entry linked with Stock Entry
2015-01-19 14:26:58 +05:30
Nabin Hait
9ef2e78905
Merge pull request #2553 from neilLasrado/mode-of-payment
...
mode of payment - company wise default account added
2015-01-19 14:26:00 +05:30
Nabin Hait
84662f2db5
minor fix in payment receipt voucher print format
2015-01-16 11:59:47 +05:30
Rushabh Mehta
0335005eea
[minor] added allow rename
2015-01-15 15:29:22 +05:30
Nabin Hait
239c2c327c
Hide currency and price list section after submission
2015-01-15 14:22:04 +05:30
Nabin Hait
fff3ab752c
Fixed conflict
2015-01-14 16:27:13 +05:30
Neil Trini Lasrado
bd2ac2f51f
mode of payment - company wise default account added
2015-01-14 12:00:17 +05:30
Neil Trini Lasrado
50763d58ce
frappe.db.exist used
2015-01-14 11:54:55 +05:30
Neil Trini Lasrado
adfdd6f83c
journal entry linked and validation added
2015-01-14 11:54:55 +05:30
Neil Trini Lasrado
e3e3a56b5c
Journal entries recalc totals on del of accounts table row
2015-01-13 12:33:15 +05:30
Nabin Hait
2244ac4d52
Discount amount in party currency
2015-01-12 17:35:37 +05:30
Neil Trini Lasrado
0866272ba1
get fiscal year fix
2015-01-12 16:41:55 +05:30
Nabin Hait
39c8c9e7b0
Fixes in print format css
2015-01-12 11:04:07 +05:30
Nabin Hait
e8500ad4e6
Multiple fixes
2015-01-10 16:05:17 +05:30
Anand Doshi
015fa7a1d1
[fix] escape quote in Accounts Receivable
2015-01-08 18:26:53 +05:30
Rushabh Mehta
d49a123fd0
[ui] listviews
2015-01-07 16:43:47 +05:30
Nabin Hait
6c1773025b
fiscal year error message
2015-01-07 11:33:14 +05:30
Rushabh Mehta
738d4ef5c8
[ui] [listviews] indicators
2015-01-06 18:09:02 +05:30
Anand Doshi
50d7e8cf8f
[design] Point of Sale
2015-01-06 17:14:26 +05:30
Rushabh Mehta
e1cb0ae738
[design] list views
2015-01-05 17:39:05 +05:30
Anand Doshi
9b955feff8
[design] POS - item grid and taxes
2015-01-05 16:19:12 +05:30
Anand Doshi
3f5e95a99e
[design] Fixed Grid Reports
2015-01-01 16:26:18 +05:30
Rushabh Mehta
4c36d7388c
[ux] fixed creation via tree views for Item Group etc
2015-01-01 15:59:34 +05:30
Rushabh Mehta
bfaf0a8f43
[tree] [ui]
2015-01-01 12:49:18 +05:30
Rushabh Mehta
419ae33c3e
[merge] v5-design
2014-12-31 15:03:14 +05:30
Nabin Hait
54361e8651
fixed conflict while merging develop into v5
2014-12-31 13:24:36 +05:30
Nabin Hait
40431cbf89
focus on barcode field after adding a row
2014-12-30 17:53:16 +05:30
Nabin Hait
dd38a266b8
Removed tname and fname from code
2014-12-26 13:15:21 +05:30
Rushabh Mehta
a5b149c061
[design] module pages, messages, timelines
2014-12-26 12:53:02 +05:30
Rushabh Mehta
4096a3ab2b
[design] form toolbar
2014-12-26 12:53:02 +05:30
Rushabh Mehta
a9ba5eff99
[design] pos
2014-12-26 12:52:11 +05:30
Rushabh Mehta
f870527e7c
[design] wip
2014-12-26 12:52:11 +05:30
Nabin Hait
79f091e2fe
field renaming
2014-12-26 11:41:15 +05:30
Nabin Hait
4b8185db19
renaming: entries
2014-12-25 18:19:39 +05:30
Nabin Hait
23d2a53017
Code replacement for journal voucher renaming
2014-12-25 17:14:18 +05:30
Nabin Hait
e7d153624f
Table Field Renaming: code replace, JV and budget distribution renamed
2014-12-25 16:01:55 +05:30
Nabin Hait
d8f4984d71
Table fieldnames renaming: updated json and patch
2014-12-24 17:04:48 +05:30
Nabin Hait
0741ed3a82
Merge pull request #2472 from neilLasrado/expense-claim
...
New feature for issue #2419
2014-12-23 18:07:38 +05:30
Nabin Hait
57595cf73b
fixed merge conflict
2014-12-23 18:05:13 +05:30
Neil Trini Lasrado
31a92bd9d9
company wise letter head feature added
2014-12-23 17:52:41 +05:30
Neil Trini Lasrado
9712e7dad4
holiday logic removed
2014-12-23 17:38:59 +05:30
Pratik Vyas
dc2630b7fa
Make Tax Assets a group in standard chart of accounts
2014-12-17 16:23:51 +05:30
Nabin Hait
6ffa445dfd
minor fixes in coa templates
2014-12-16 12:49:35 +05:30
Neil Trini Lasrado
e1f21682fb
changes made
2014-12-12 13:09:42 +05:30
Neil Trini Lasrado
cc73999497
validate fixed
2014-12-12 12:33:55 +05:30
Neil Trini Lasrado
f13c4f0145
New feature for issue #2419
2014-12-12 12:33:55 +05:30
Nabin Hait
abfc72ded4
Merge pull request #2450 from ankitjavalkarwork/fix2363
...
Add print formats for Acc. Receivable/Payable and Summary reports
2014-12-11 17:40:54 +05:30
Nabin Hait
4f7c51d68e
Merge pull request #2442 from ankitjavalkarwork/gross-profit
...
Gross profit
2014-12-11 17:37:54 +05:30
Nabin Hait
bef80bab0d
Removed gross profit field from sales invoice
2014-12-11 16:27:18 +05:30
Nabin Hait
35ebe1bf78
Tax amount in POS invoice print format
2014-12-10 12:42:32 +05:30
Nabin Hait
b14cc0417d
Display tax amount after discount, if there is any discount amount
2014-12-10 12:28:25 +05:30
Neil Trini Lasrado
c0063a6e74
sales Invoice- filter added for debit to
2014-12-09 17:03:13 +05:30
Nabin Hait
7887ccb441
Credit days fix
2014-12-09 14:34:14 +05:30
Nabin Hait
d57b57a21d
Minor fix in accounts receivable report
2014-12-09 11:56:13 +05:30
ankitjavalkarwork
35db282765
Fix gross_profit.py, commonify and add elementwise grouping to report
2014-12-04 13:08:42 +05:30
Rushabh Mehta
ec9db4b799
[report] gross profit WIP
2014-12-04 12:37:39 +05:30
Rushabh Mehta
969069fbf9
[report] gross profit WIP
2014-12-04 12:37:39 +05:30
ankitjavalkarwork
c41a0e2e38
Add print formats for Acc. Receivable/Payable and Summary reports
2014-12-02 15:13:36 +05:30
Nabin Hait
6871c74ce1
Merge pull request #2444 from ankitjavalkarwork/contactmob
...
Display mobile no. of contact
2014-12-02 10:35:46 +05:30
Rushabh Mehta
3d65d9602e
[error-reports]
2014-11-28 14:58:43 +05:30
Rushabh Mehta
6d950d23a8
[merge]
2014-11-28 12:08:51 +05:30
ankitjavalkarwork
9440d080d4
Print Hide Recurring Order/Invoice based fields
2014-11-27 17:28:53 +05:30
Nabin Hait
249bbbc56f
fixes during testing version 5
2014-11-26 15:35:39 +05:30
Nabin Hait
707322adb9
Fixes for standard chart of accounts
2014-11-14 18:13:33 +05:30
Nabin Hait
601fcde31c
Merge pull request #2383 from neilLasrado/pos
...
POS feature #2305
2014-11-14 18:12:26 +05:30
Nabin Hait
40c47b2236
Merge pull request #2395 from ankitjavalkarwork/fix2230
...
[#2230 ] Add Totals row to Gross Profit report
2014-11-14 18:06:19 +05:30
ankitjavalkarwork
fff1b42f80
Fix Error message, add account_type to 'inventories' in Chart Of Acc.
2014-11-14 14:19:06 +05:30
Nabin Hait
4215b3afc3
temporary fix in payment tool
2014-11-14 10:51:31 +05:30
Nabin Hait
4cd60d7d61
Included standard charts in json format
2014-11-12 14:29:44 +05:30
Nabin Hait
4963ac2af5
charts for brazil
2014-11-12 14:29:44 +05:30
Nabin Hait
f3d7ef3a1b
Chart of accounts name cleanup
2014-11-12 14:29:44 +05:30
Nabin Hait
ed9c26db4d
Show only active and enabled charts for any country
2014-11-12 14:29:44 +05:30
Neil Trini Lasrado
737cedaeef
Required modifications done
2014-11-11 16:52:34 +05:30
Neil Trini Lasrado
2c388f9d7e
POS feature #2305
2014-11-11 16:00:09 +05:30
Nabin Hait
6c1011df92
Reference / Cheque date is after due date
2014-11-10 14:57:53 +05:30
ankitjavalkarwork
bd8a8b9bd7
[ #2230 ] Add Totals row to Gross Profit report
2014-11-10 12:36:43 +05:30
Nabin Hait
d795dfd8de
Credit days validation fixes
2014-11-10 11:39:55 +05:30
Nabin Hait
bf836277f9
Payment tool fix: get outstanding sales orders
2014-11-10 11:28:25 +05:30
Nabin Hait
10d1806d81
Credit days validation fixes
2014-11-10 11:11:58 +05:30
Nabin Hait
ae1dcabcb5
Fixed merge conflict
2014-11-05 12:41:02 +05:30
Nabin Hait
fad0d566f9
Payment receipt voucher print format fixed
2014-11-04 15:34:03 +05:30
ankitjavalkarwork
e6e65b0907
[ #2362 ] Commonify Acc. Receivable Summary Report and add Acc. Payable Summary Report
2014-11-04 14:40:33 +05:30
Nabin Hait
36463ed790
Merge pull request #2375 from nabinhait/fix1
...
Check credit limit only if customer debited
2014-11-03 15:55:03 +05:30
Nabin Hait
3c8838816d
Check credit limit only if customer debited
2014-11-03 15:49:29 +05:30
Nabin Hait
7b3543caaf
Check credit limit only if customer debited
2014-11-03 15:46:15 +05:30
Nabin Hait
f09667884b
Root type indentified for multiple country's chart
2014-11-03 15:46:15 +05:30
ankitjavalkarwork
f5804438bb
Auto set default bank/cash account on select of Bank/Cash Voucher in JV
2014-11-03 12:23:55 +05:30
Nabin Hait
e6370860a0
accounts receivable summary report cleanup
2014-10-30 15:54:40 +05:30
Nabin Hait
7dbcee87af
AR/AP report cleanup
2014-10-30 15:54:39 +05:30
Nabin Hait
99be941e7b
Party is only relevant to receivable/payable account
2014-10-30 15:54:39 +05:30
ankitjavalkarwork
574e55788f
[ #1379 ] Add Accounts Receivable Summary Report
2014-10-30 15:54:39 +05:30
ankitjavalkarwork
e63432db63
Commonify AR and AP reports
2014-10-30 15:54:39 +05:30
Nabin Hait
ee212e7bb5
[fix] Floating point issue fixed in payment reconciliation
2014-10-29 14:26:05 +05:30
Nabin Hait
7cdb25b733
Merge pull request #2337 from neilLasrado/makepaymententryfix
...
Error fix, arguments in function call for Make Payment Entry from SI/PI
2014-10-27 11:42:50 +05:30
Nabin Hait
f5b94143dc
Minor fixes
2014-10-22 16:14:41 +05:30
Rushabh Mehta
39dbf73de7
[merge] item-variants
2014-10-21 13:24:46 +05:30
Rushabh Mehta
be1a8d82c5
[merge] develop
2014-10-21 13:14:55 +05:30
Rushabh Mehta
ab43942b35
Merge pull request #2231 from rmehta/item-variants
...
Item variants
2014-10-21 12:38:16 +05:30
Neil Trini Lasrado
572ad4c8ef
Error fix, arguments in function call for Make Payment Entry from SI/PI
2014-10-21 12:34:07 +05:30
Nabin Hait
259f9779db
Credit Note: Set total amount and print format fix
2014-10-20 11:18:11 +05:30
Neil Trini Lasrado
1cdfbdb899
fiscal year auto-create added
2014-10-17 15:44:22 +05:30
Nabin Hait
fc2dd44694
Partial payment reconciliation. Fixes #1982
2014-10-17 14:57:20 +05:30
Nabin Hait
f1a07ff105
Allow zero rate while reposting
2014-10-15 12:23:35 +05:30
Nabin Hait
38d0ed9f3a
Negative stock allowed for perpetual inventory. Blocked in specific case
2014-10-14 16:08:19 +05:30
Nabin Hait
17a16eeaf4
Tets case fixed for payment tool
2014-10-13 11:43:14 +05:30
Nabin Hait
79ed124939
Update journal_voucher.py
2014-10-10 18:19:03 +05:30
Nabin Hait
30a0e3e8b4
Merge pull request #2275 from ankitjavalkarwork/fix2164
...
Add Delivery Qty to Sales Invoice From Delivery Note, Misc fixes
2014-10-10 18:05:19 +05:30
ankitjavalkarwork
0cf4cc283c
Add Shipping Addr to Sales Invoice
2014-10-10 16:55:03 +05:30
ankitjavalkarwork
9a4b173b88
Add validation for stopped orders, advance payment in journal voucher
2014-10-10 16:28:41 +05:30
ankitjavalkarwork
6d83454237
Disallow Stopped Orders in Against Voucher table
2014-10-10 13:30:10 +05:30
ankitjavalkarwork
ff231b5e62
Allow advance JV payments in Accounts Receivable/Payable
2014-10-10 13:13:39 +05:30
ankitjavalkarwork
e69a611991
[ #2164 ] New field names in DN, fix field name refs, Patch added
2014-10-09 17:31:46 +05:30
ankitjavalkarwork
9aadb0d95d
[ #2164 ] Add Delivered Qty to Sales Inv from Delivery Note, fix issues
2014-10-09 17:31:46 +05:30
Neil Trini Lasrado
9614b552fd
fiscal year auto-fetch added to c-form, installation_note, stock_reconciliation, customer_issue, maintanence_visit & removed for Expense Claim
2014-10-09 15:01:12 +05:30
Neil Trini Lasrado
e6b14a4bf6
Fixed issues
2014-10-09 15:01:12 +05:30
Neil Trini Lasrado
78fa6954e5
Fiscal year autofetch added
2014-10-09 15:01:12 +05:30
ankitjavalkarwork
e93b1fc508
[fix][ #1450 ] Add Shipping Addr field to Sales Invoice
2014-10-09 12:11:49 +05:30
Nabin Hait
12ade3c682
Merge pull request #2250 from ankitjavalkarwork/fix1808
...
[fix][#1808 ] Allow configurable AR/AP ageing dates
2014-10-09 11:24:01 +05:30
ankitjavalkarwork
1b2944e871
Rearrange To/From, Recurring Type field for better UX
2014-10-08 14:24:58 +05:30
Rushabh Mehta
c2d2857540
[fixes] tests and moved reorder_item to separate module
2014-10-08 12:19:55 +05:30
Nabin Hait
adeb976a1b
Block negative stock in perpetual inventory
2014-10-08 11:02:18 +05:30
ankitjavalkarwork
6c29d8789a
[fix][ #1769 ] Add disable option to Sales/Purchase Tax Master with validation
2014-10-07 14:44:37 +05:30
Rushabh Mehta
baef96b5a2
[item-variants] allow production order of variant #2224
2014-10-07 12:34:19 +05:30
Rushabh Mehta
ef276045c4
[item variants] make variants, bom updates
2014-10-07 11:40:47 +05:30
Rushabh Mehta
70aa8933b1
[item variant] started
2014-10-07 11:39:54 +05:30
Nabin Hait
b70712dbba
Voucher dynamic link in general ledger report
2014-10-07 11:32:54 +05:30
ankitjavalkarwork
437af5b031
[fix][ #1808 ] Allow configurable AR/AP ageing dates
2014-10-07 11:32:21 +05:30
Nabin Hait
2dcc576f0e
Chart finalizzed for Austria and UAE
2014-10-06 13:15:21 +05:30
Nabin Hait
6f17cf93c5
Party balance
2014-10-06 13:15:21 +05:30
Nabin Hait
997a7a1d3e
Test case fixes
2014-10-06 13:15:21 +05:30
Nabin Hait
678b441082
Payment tool as per party model
2014-10-06 13:15:02 +05:30
Nabin Hait
36cf4a4708
Test case fixes
2014-10-06 13:15:02 +05:30
Nabin Hait
034ac6b00b
Payment Reconciliation based on party
2014-10-06 13:14:22 +05:30
Nabin Hait
894a1b539a
Dynamic link in general ledger and stock ledger report
2014-10-06 13:14:22 +05:30
Nabin Hait
cb8e255f0f
Dynamic link for voucher no in AR/AP report
2014-10-06 13:14:22 +05:30
Nabin Hait
bd1c8aff8e
Deleted customer/supplier account head report
2014-10-06 13:14:02 +05:30
Nabin Hait
76030540cb
Accounts Receivable/Payable report based on party
2014-10-06 13:14:02 +05:30
Nabin Hait
965a5a34b5
Party is now dynamic link in JV and GL Entry
2014-10-06 13:13:28 +05:30
Nabin Hait
62c762aac5
Sales/purchase register and item-wise sales/purchase register fixes for party
...
Show Delivery Note and Purchase Receipt based on SO and PO if it not defined in SI/PI #2166
2014-10-06 13:13:27 +05:30
Nabin Hait
db030d1761
Set Receivable/Payable account based on party
2014-10-06 13:13:27 +05:30
Nabin Hait
e2095c0dd7
Created new doctype Party Account to maintain default party account, it is a child table for Customer, Supplier, Customer Group, Supplier type
...
Default Receivable / Payable Account in company
Filter results in all receivable/payable link fields
2014-10-06 13:12:05 +05:30
Nabin Hait
3225102eb9
Update outstanding amt based on party
...
Party mandatory if account is receivable/payable
Fetch advance based on party
Reconciliation splitting logic based on party
2014-10-06 13:09:18 +05:30
Nabin Hait
cc582bd774
posted party in gl entry and multiple other fixes
2014-10-06 13:06:11 +05:30
Nabin Hait
3a40435f8c
Credit days and credit limit option in customer group / supplier type #1354
2014-10-06 13:05:28 +05:30
Nabin Hait
e9daefe07f
Credit Limit and credit days fixes #2031
2014-10-06 13:05:28 +05:30
Nabin Hait
be8ec39678
Deleted master_type, master_name, credit_days, credit_limit fields from account
...
Warehouse account is linked via Warehouse field now, instead of master_name field
patch to copy warehouse value from master_name to warehouse
party_type and party field added in GL Entry and Journal Voucher Detail
2014-10-06 13:02:40 +05:30
Nabin Hait
fbc3d25d13
Root type defined for uae and austria
2014-10-06 13:01:58 +05:30
Nabin Hait
9ddc002d6a
country wise chart of accounts restructured
2014-10-06 13:01:58 +05:30
Nabin Hait
712aa5809d
Minor changes in import-from-odoo
2014-10-06 13:01:57 +05:30
ankitjavalkarwork
9e5f319d80
[ #2253 ] Rearrange To/From fields and depend on is_recurring in SI,SO,PI,PO
2014-10-06 12:58:38 +05:30
Nabin Hait
c68646c694
[merge] 4.x to 5.0
2014-10-06 12:57:48 +05:30
ankitjavalkarwork
44d42ddf63
[fix] Merge permission roles to modify frozen entries/set frozen accounts
2014-09-30 10:40:39 +05:30
Aditya Duggal
a2c9d35efb
Added the dynamic link field.
2014-09-29 17:44:28 +05:30
Aditya Duggal
4c058f4056
Added the dynamic link and removed the link column
2014-09-29 17:41:19 +05:30
Rushabh Mehta
86211cd219
Merge pull request #2203 from rmehta/mailbox
...
Mailbox
2014-09-29 14:18:10 +05:30
Nabin Hait
b9e04815f8
Repost gl entries for future stock vouchers
2014-09-26 14:24:42 +05:30
Nabin Hait
b783f519ee
Fixes in sales/purchase invoice trends report
2014-09-26 14:23:00 +05:30
Anand Doshi
32a9dfd983
Merge branch 'sbkolate-develop' into develop
2014-09-22 13:19:24 +05:30
Anand Doshi
1394509343
Fixes for recurring document
2014-09-21 19:45:49 +05:30
ankitjavalkarwork
9aa11d2ad7
Add ability to fetch Non stock items in Gross Profit report
2014-09-18 19:08:04 +05:30
Nabin Hait
48f5fa69f3
Fetch and validate advance entries in sales/purchase invoice
2014-09-18 15:04:11 +05:30
Anand Doshi
8370cb3e71
Merge branch 'develop' of https://github.com/sbkolate/erpnext into sbkolate-develop
2014-09-18 12:06:05 +05:30
Nabin Hait
556fbc487d
Minor fix in gross profit report
2014-09-17 12:13:44 +05:30
Rushabh Mehta
c0bb453b88
[refactor] [frappe 5.0]
2014-09-16 15:10:54 +05:30
Nabin Hait
9d610214cf
Strip party name before checking for account
2014-09-16 12:28:40 +05:30
Anand Doshi
93c2adb2cd
Merge pull request #2193 from anandpdoshi/anand-september-15
...
Recurring fix, cherry-picked nabin's address template fix
2014-09-15 13:04:12 +05:30
Sambhaji Kolate
525ab0a925
fix build
2014-09-15 12:57:58 +05:30
Anand Doshi
a92c6886cd
Merge pull request #2173 from ankitjavalkarwork/fix2043
...
Add message on cancel in SI if C-Form exists, fix minor error, Add validation in C-Form
2014-09-15 12:56:51 +05:30
Anand Doshi
01d171756b
[fix] before_recurring, set due_date, ageing_date as None, fixed account due date validation
2014-09-15 12:50:37 +05:30
Sambhaji Kolate
930e7f5578
fix conflict
2014-09-15 12:43:48 +05:30
Sambhaji Kolate
d14e15d432
fix conflict
2014-09-15 12:31:44 +05:30
Sambhaji Kolate
4d3a18890b
fix conflict
2014-09-15 12:20:11 +05:30
81552433qqcom
c5a0ef8399
fix according to the suggestion.
2014-09-12 16:07:12 +05:30
81552433qqcom
951da0ca3d
added translations to report py file.
2014-09-12 16:07:12 +05:30
81552433qqcom
4bab0a2f54
various translation missed __()
2014-09-12 16:07:11 +05:30
Anand Doshi
61a591944b
[minor] ui/ux fixes in Payment Tool
2014-09-12 15:42:16 +05:30
Ankit Javalkar
8e7ca41817
Payment Tool #2106
2014-09-12 15:23:46 +05:30
Nabin Hait
c432270ca8
Report print format fixed for translated columns
2014-09-12 12:00:47 +05:30
ankitjavalkarwork
3df10429db
Add message on cancel in SI if C-Form exists, Add validation in C-Form, remove update_c_form
2014-09-11 16:58:18 +05:30
Sambhaji Kolate
b14401c320
change convert_to_recurring() to take recurring_id dynamicaly
2014-09-11 16:09:05 +05:30
Nabin Hait
cece0c7ffe
Opening entry should not be considered in bank reconciliation statement
2014-09-11 13:59:00 +05:30
Sambhaji Kolate
b2a3f2d386
some minor changes get fixed for PO/PI
2014-09-10 17:40:48 +05:30
Sambhaji Kolate
6b679c45df
Updated purchase_invoice.json and purchase_order.json with some missed out changes
2014-09-10 13:57:45 +05:30
