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 |
|