Nabin Hait
ed8a845e83
POS Make Payment dialog box fix #1441
2014-05-05 11:01:32 +05:30
Anand Doshi
69e0cb5d6f
Fixed POS and Sales Invoice paid amount display, when invoice not submitted. Fixes #1573
2014-05-04 19:37:45 +05:30
Nabin Hait
a096b2004f
Financial analytics graph fix #1542
2014-05-04 16:02:26 +05:30
Nabin Hait
6b03914731
asynchronus issue in get_party_details
2014-05-02 15:45:10 +05:30
Nabin Hait
d341254786
Purchase receipt to purchase invoice item
2014-05-01 17:42:21 +05:30
Nabin Hait
5b98340d15
payment to invoice matching
2014-05-01 15:43:22 +05:30
Rushabh Mehta
a15164750d
started client side testing using selenium and other related and unrelated fixes
2014-04-30 19:39:13 +05:30
Nabin Hait
b85a9108eb
Payment to invoice matching tool
2014-04-30 19:32:16 +05:30
Nabin Hait
498ecfc192
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-04-30 19:31:22 +05:30
Nabin Hait
576f025c84
Payment to invoice matching tool
2014-04-30 19:30:50 +05:30
Anand Doshi
04f8990c11
Fixed can freeze account check for account doc in client side
2014-04-30 15:02:17 +05:30
Rushabh Mehta
d21f55b5d2
fix in naming and feature setup on install:
2014-04-29 16:25:07 +05:30
Nabin Hait
b54307d58e
minor fixes for pos trigger
2014-04-29 13:40:54 +05:30
Anand Doshi
cd17bdffcd
Fixes in account query, fiscal year and cost center
2014-04-28 20:34:48 +05:30
Nabin Hait
6777efa7fa
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-04-28 17:09:13 +05:30
Nabin Hait
985918d42b
Minor fixes in company and account
2014-04-28 17:08:28 +05:30
Néstor Díaz Valencia
21412ddf65
Update mode_of_payment.py
...
Renamed solves issue #1536
2014-04-28 11:54:31 +02:00
Anand Doshi
1872312cc6
Deprecated client side mapper: frappe.model.map. Fixes #1530
2014-04-25 18:38:08 +05:30
Anand Doshi
69a2c25ca5
Fixed set_query
2014-04-25 18:35:45 +05:30
Anand Doshi
8bde7f9b3a
Conditionally toggle Naming Series. Fixes #1526
2014-04-24 18:11:49 +05:30
Anand Doshi
f50a65294f
Fixed NameError handling
2014-04-23 13:41:28 +05:30
Anand Doshi
b054eb7a4f
Call calculate_taxes_and_totals after mapping
2014-04-22 20:35:22 +05:30
Anand Doshi
3e41fd1fd3
List route for tree browser based doctypes; Fixes to add child in tree browsers
2014-04-22 18:55:21 +05:30
Anand Doshi
424c033395
Removed controller.py
2014-04-21 15:06:56 +05:30
Anand Doshi
9365b616b8
Added an exist check for accounts.utils.get_balance_on
2014-04-21 12:42:21 +05:30
Anand Doshi
cbbf451974
Fixes throw
2014-04-21 11:33:49 +05:30
Anand Doshi
dbfcd328fb
Fixes update_after_submit validation errors
2014-04-17 12:35:04 +05:30
Rushabh Mehta
c38fc713c6
updated translations
2014-04-16 17:46:30 +05:30
Anand Doshi
652bc0784a
Ported v3 fixes to v4
...
Commit range: webnotes/erpnext@e4b72df2f4bd7272c42e90f6faec3c27aa763b82..webnotes/erpnext@85441b0180f84246259d5a0ab4e3bcbf29355efe
2014-04-16 15:26:42 +05:30
Nabin Hait
a0c239db8d
perpetual inventory fix related to sub-contracting
...
Cherry-picked and modified by @anandpdoshi
Conflicts:
accounts/doctype/purchase_invoice/purchase_invoice.py
controllers/buying_controller.py
controllers/stock_controller.py
2014-04-16 15:23:10 +05:30
Anand Doshi
88a869f34d
No Copy for Paid and Write Off Amount in Sales Invoice
...
Ported webnotes/erpnext@f739bffedd
2014-04-16 15:23:08 +05:30
Rushabh Mehta
ff93802d58
more message fixes
2014-04-15 18:40:31 +05:30
Anand Doshi
a6e2ca9d3b
Fixes #1491
2014-04-15 17:12:15 +05:30
Rushabh Mehta
8a40c136ce
more message fixing
2014-04-15 16:31:20 +05:30
Rushabh Mehta
2c45899a02
fixed strings for translation
2014-04-15 14:41:56 +05:30
Pratik Vyas
f37d6fe32b
Merge pull request #1514 from frappe/js-translate-refactor
...
JS translation refactor
2014-04-15 11:44:16 +05:30
Pratik Vyas
13c92e3ad5
fix accounts browser and cost center strings (js)
2014-04-15 10:08:53 +05:30
Pratik Vyas
ec9c448ccf
fix taxes and charges strings and labels
2014-04-15 09:49:40 +05:30
Rushabh Mehta
549977bf4f
typo fix in journal_voucher.py
2014-04-14 22:40:17 +05:30
Rushabh Mehta
9f0d625300
update translation strings #1403
2014-04-14 19:20:45 +05:30
Pratik Vyas
b0f279a34e
js translations refactor
2014-04-14 17:14:23 +05:30
Pratik Vyas
b52618c142
frappe._ to __
2014-04-14 16:25:30 +05:30
Anand Doshi
bd67e87921
Fixes saving of Sales Order and fetching Prices frappe/frappe#478
2014-04-11 16:51:27 +05:30
Anand Doshi
13ae548ff6
Fixes for model-cleanup frappe/frappe#478
2014-04-10 18:43:07 +05:30
Anand Doshi
9fd50bcfb6
Fixed rest of the test cases frappe/frapp#478
2014-04-09 19:20:01 +05:30
Anand Doshi
d29465029d
Fixed Test Cases frappe/frappe#478
2014-04-08 20:15:22 +05:30
Anand Doshi
cd71e1d8ab
Test Cases - Journal Voucher, Purchase Invoice, Period Closing Voucher frappe/frappe#478
2014-04-08 13:53:35 +05:30
Anand Doshi
2ce39cf770
Fixed Stock Entry Test Cases frappe/frappe#478
2014-04-07 18:51:58 +05:30
Rushabh Mehta
322d39f3a6
Merge branch 'model-cleanup' of github.com:frappe/erpnext into model-cleanup
2014-04-07 15:09:25 +05:30
Rushabh Mehta
49f49ea603
started party frappe/erpnext#1503
2014-04-07 15:09:09 +05:30
Nabin Hait
dc82d4f0cd
frappe/frappe#478 fixes
2014-04-07 12:02:57 +05:30
Nabin Hait
e7885e3ee0
frappe/frappe#478 replaced doclist in testcases
2014-04-04 13:26:50 +05:30
Rushabh Mehta
a504f0638b
frappe/frappe#478 , fixed list passed in
2014-04-04 12:16:26 +05:30
Rushabh Mehta
558a9aabfb
removed control panel
2014-04-04 12:00:36 +05:30
Nabin Hait
312ba99e71
frappe/frappe#478 fixes
2014-04-04 11:06:10 +05:30
Nabin Hait
365ae27acf
frappe/frappe#478 fixes
2014-04-03 17:38:54 +05:30
Rushabh Mehta
f14b809ab5
frappe/frappe#478 , more changes, removed bean
2014-04-03 14:30:42 +05:30
Rushabh Mehta
d36cb5c812
frappe/frappe#478 removed more instances of doclist
2014-04-03 12:38:42 +05:30
Rushabh Mehta
f191f854cd
frappe/frappe#478 erpnext install works
2014-04-02 18:09:34 +05:30
Anand Doshi
5b552b51f1
frappe/frappe#478
2014-04-02 15:03:35 +05:30
Rushabh Mehta
f2227d033c
frappe/frappe#478 , removed instances of .fields
2014-03-31 23:37:40 +05:30
Rushabh Mehta
231f6a5b58
frappe/frappe#478 added test_records.json
2014-03-31 23:05:12 +05:30
Rushabh Mehta
0a0f2495a2
frappe/frappe#478 , frappe tests pass, .txt renamed to .json
2014-03-31 17:27:06 +05:30
Nabin Hait
0e13cd5ac9
frappe/frappe#478
2014-03-28 17:01:32 +05:30
Nabin Hait
0d8d30e1cc
frappe/frappe#478
2014-03-28 16:57:21 +05:30
Rushabh Mehta
b385ecf65e
frappe/frappe#478
2014-03-28 16:54:45 +05:30
Anand Doshi
81ba0b29da
frappe/frappe#478
2014-03-28 15:23:26 +05:30
Anand Doshi
f78d1aee28
Replaced doc, doc.fields frappe/frappe#478
2014-03-28 13:55:00 +05:30
Anand Doshi
67d6a4e3aa
Merge remote-tracking branch 'frappe/develop' into model-cleanup
...
Conflicts:
erpnext/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
erpnext/controllers/stock_controller.py
2014-03-28 13:41:59 +05:30
Anand Doshi
40534f076b
Changed creation, modified format frappe/frappe#478
2014-03-28 12:46:53 +05:30
Rushabh Mehta
daae743608
frappe/frappe#478
2014-03-27 17:54:18 +05:30
Rushabh Mehta
e88bc8b12a
frappe/frappe#478
2014-03-27 17:51:41 +05:30
Nabin Hait
4090c78c3f
coa: payment to invoice matching tool fixes
2014-03-27 17:19:32 +05:30
Nabin Hait
becf75d791
Perpetual inventory cleanup
2014-03-27 17:18:29 +05:30
Rushabh Mehta
d2b34dc30c
frappe/frappe#478
2014-03-27 16:12:56 +05:30
Rushabh Mehta
66d52b55c0
#478
2014-03-27 14:17:33 +05:30
Rushabh Mehta
aa355af2cf
refactored client side Model and Meta - frappe/frappe#478
2014-03-26 18:24:30 +05:30
Anand Doshi
79196a9ef7
Fixed install
2014-03-25 19:32:08 +05:30
Nabin Hait
2c517e0a62
Fixes related to countrywise coa
2014-03-25 18:28:49 +05:30
Nabin Hait
06a595090d
coa: minor fix
2014-03-21 18:30:46 +05:30
Nabin Hait
0c21e2afef
Is_pl_account and debit_or_credit field removed and added report_type field in account
2014-03-21 11:35:59 +05:30
Nabin Hait
b5e6d7e171
Account balance in debit and credit columns in trial balance and financial analytics report
2014-03-21 11:26:09 +05:30
Nabin Hait
e67202484d
Imported charts with proper report types
2014-03-21 11:26:08 +05:30
Nabin Hait
e0f98d7202
account properties file added
2014-03-21 11:26:08 +05:30
Nabin Hait
73083dc960
Fix related to user_default
2014-03-21 11:26:08 +05:30
Nabin Hait
27bb7892b3
Fixes in pos settings
2014-03-21 11:26:07 +05:30
Nabin Hait
e848914da1
consider all entries against bank account in bank reconciliation statement, even if no reference no
2014-03-21 11:25:17 +05:30
Nabin Hait
d8dcdfbf4f
Warehouse disable option
2014-03-21 11:25:17 +05:30
Nabin Hait
eb1192771f
set root type from parent or child
2014-03-21 11:25:17 +05:30
Nabin Hait
e71cf6d6a1
More country charts imported from openerp
2014-03-21 11:25:17 +05:30
Nabin Hait
037bf6b382
More country charts imported from openerp
2014-03-21 11:25:17 +05:30
Nabin Hait
3dfe854108
Rename duplicate account
2014-03-21 11:25:16 +05:30
Nabin Hait
fc37fd8b6e
Set Paid amount and write off amount for pos
2014-03-21 11:25:16 +05:30
Nabin Hait
55a03dbf69
major fixes in importing charts from openerp
2014-03-21 11:22:42 +05:30
Nabin Hait
b93ebaebe4
Added new account types and patch for existing
2014-03-21 11:22:41 +05:30
Nabin Hait
a18bf07920
updated charts json with proper account and root types
2014-03-21 11:22:41 +05:30
Nabin Hait
813a93d78d
import chart records into database frm json
2014-03-21 11:22:40 +05:30
Nabin Hait
d89f3403ac
charts of account doctype added and imported charts json from openerp
2014-03-21 11:22:39 +05:30
Nabin Hait
b77773ca07
fixes in financial statements
2014-03-21 11:22:38 +05:30
Nabin Hait
2b57ecbd6c
fixes for debit_or_credit in account tree grid report
2014-03-21 11:22:38 +05:30
Nabin Hait
53822ae9d0
Account balance must be of type debit/credit
2014-03-21 11:22:38 +05:30
Nabin Hait
49a6f0754e
Removed debit_or_credit field
2014-03-21 11:22:38 +05:30
Nabin Hait
133490a0c5
Removed max roots validation
2014-03-21 11:22:37 +05:30
Nabin Hait
4d713ac5ba
sql injection fixes
2014-03-21 11:22:37 +05:30
Anand Doshi
4b2692182a
Fixes after change in fields handling in Document
2014-03-19 16:58:42 +05:30
Rushabh Mehta
7c932003ed
rename Profile to User frappe/frappe#470
2014-03-11 16:15:59 +05:30
Anand Doshi
09a9f4c0c9
Added module to Report doctype
2014-03-07 17:20:22 +05:30
Rushabh Mehta
d8de921c40
fixed erpnext/frappe#1441 and other pos related cleanups
2014-03-06 15:40:22 +05:30
Rushabh Mehta
2e7ad8980c
fix for queries
2014-03-06 12:28:47 +05:30
Rushabh Mehta
4541875c81
removed searchfield condition from get_match_cond frappe/erpnext#1457
2014-03-06 11:19:46 +05:30
Anand Doshi
b2c2fca8a5
Added Pricing Rule to Accounts, Buying, Selling home
2014-03-05 18:25:10 +05:30
Anand Doshi
7ea8528d50
Fixed Pricing Rule Cleanup Fieldname
2014-03-05 17:27:00 +05:30
Anand Doshi
f5794f1c07
Module Home Pages using Module View
2014-03-03 15:06:34 +05:30
Nabin Hait
177b86a15b
fix in pricing rule
2014-02-28 15:47:22 +05:30
Nabin Hait
e7e615cf18
pricing rule: fixes in testcase
2014-02-28 15:21:49 +05:30
Nabin Hait
13b93ebed8
pricing rule: fixes in testcase
2014-02-28 15:04:05 +05:30
Nabin Hait
ed5f423e65
pricing rule: condition for tree-type docs
2014-02-28 13:04:19 +05:30
Nabin Hait
08222150f2
Pricing Rule fixes and reference field in all item table
2014-02-28 13:02:00 +05:30
Nabin Hait
7e8e8ba714
pricing rule
2014-02-28 13:02:00 +05:30
Nabin Hait
615d342056
Pricing Rule: first commit
2014-02-28 13:02:00 +05:30
Anand Doshi
e9baaa68e7
Changed frappe.conn to frappe.db
2014-02-26 12:35:33 +05:30
Anand Doshi
901f4434fd
Fixed Purchase Invoice test cases
2014-02-25 17:25:28 +05:30
Anand Doshi
201dbbd977
Quotation Item Table can be empty
2014-02-25 15:42:32 +05:30
Nabin Hait
74bbd24b1d
Merge github.com:frappe/erpnext into develop
2014-02-19 17:43:51 +05:30
Nabin Hait
9d1f077922
get lead details in quotation
2014-02-19 17:43:24 +05:30
Rushabh Mehta
e0e3f92019
fixed sales / accounts tree
2014-02-19 12:43:16 +05:30
Pratik Vyas
31affc0e67
bump modified dates for purchase receipt and purchase invoice
2014-02-17 11:36:10 +05:30
Rushabh Mehta
793ba6bd37
-webnotes +frappe 💥
2014-02-14 15:47:51 +05:30
Nabin Hait
8ae051cb39
fixed conflict
2014-02-14 13:42:41 +05:30
Nabin Hait
0aa71a5c41
minor fixes
2014-02-12 14:54:15 +05:30
Nabin Hait
5aecc538dd
Letter Head field added in purchase receipt and invoice
2014-02-12 14:54:15 +05:30
Nabin Hait
5f59726903
Rename fields: replaced in html and txt files
2014-02-12 14:54:15 +05:30
Nabin Hait
1eb560130a
Rename fields: amount related fields
2014-02-12 14:54:14 +05:30
Nabin Hait
7979f7ed21
Field Rename: rate field mass replacement
2014-02-12 14:54:14 +05:30
Nabin Hait
a7f757a3f4
Rename fields: initial commit
2014-02-12 14:54:13 +05:30
Nabin Hait
777397489e
Fields renamed in schema
2014-02-12 14:54:13 +05:30
Nabin Hait
436f526102
commonify get_item_details and rename fields to sync selling and purchase
2014-02-12 14:54:12 +05:30
Anand Doshi
2735733d1f
Minor fix in setup import
2014-02-11 20:28:11 +05:30
Anand Doshi
93fdc670fe
Fixes in Test Cases
2014-02-11 14:40:21 +05:30
Anand Doshi
7bb9c3f125
Nested Set Test using Test Item group
2014-02-06 17:51:18 +05:30
Nabin Hait
574c7e7c63
item related cleanup
2014-02-06 15:51:01 +05:30
Rushabh Mehta
cc008cc109
commonified get_party_details
2014-02-03 16:14:56 +05:30
Rushabh Mehta
347889b233
merge
2014-02-03 14:49:53 +05:30
Rushabh Mehta
8ed0268b9d
fix to SalesInvoice format
2014-02-03 14:40:01 +05:30
Rushabh Mehta
fa799f7d81
Merge branch '4.0.0-cleanup' of github.com:webnotes/erpnext into 4.0.0-cleanup
2014-02-03 14:38:52 +05:30
Nabin Hait
23c28704d2
Field arrangement in child table
2014-02-03 14:36:59 +05:30
Nabin Hait
7f80485070
Merge pull request #1374 from akhileshdarjee/sms-center
...
SMS center character count
2014-01-31 02:57:35 -08:00
Nabin Hait
c3211ab394
Merge pull request #1368 from akhileshdarjee/default-tax
...
Default tax for customer and supplier
2014-01-31 02:40:51 -08:00
Akhilesh Darjee
4e3b601990
webnotes/erpnext#1188 sms center character count
2014-01-30 19:13:25 +05:30
Nabin Hait
ec43e4dd33
Merged with develop
2014-01-30 15:22:10 +05:30
Rushabh Mehta
fcb6b01e4e
cleaned up email
2014-01-30 15:09:05 +05:30
Akhilesh Darjee
e0a1039756
merge conflict fixed
2014-01-30 14:44:35 +05:30
Nabin Hait
0ff32e73ba
Merged with 4.0.0-wip
2014-01-30 12:41:52 +05:30
Nabin Hait
fe8db590a1
Fixed conflict while merging with develop
2014-01-30 12:32:47 +05:30
Nabin Hait
b87e9f2651
Fixes in fetching party details
2014-01-29 19:51:36 +05:30
Akhilesh Darjee
4f7215662d
webnotes/erpnext#1090 set default tax type in customer and supplier
2014-01-29 16:31:38 +05:30
Rushabh Mehta
24da761a17
more updates to party
2014-01-29 15:26:04 +05:30
Akhilesh Darjee
2ced3b07d4
changed fieldname from charge to taxes
2014-01-28 19:16:05 +05:30
Rushabh Mehta
49dd7bee87
added get_supplier_details and commonified invoice functions
2014-01-28 17:43:10 +05:30
Nabin Hait
21d324c597
Merged with 4.0-wip
2014-01-28 15:52:25 +05:30
Akhilesh Darjee
ffa4769b51
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0-hotfix
2014-01-27 17:32:32 +05:30
Akhilesh Darjee
db4304914c
POS Invoice print format showing inclusive taxes and discount amount
2014-01-27 17:27:39 +05:30
Anand Doshi
cb39e0878e
Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip
...
Conflicts:
config.json
erpnext/accounts/utils.py
erpnext/patches/patch_list.py
erpnext/stock/doctype/price_list/price_list.txt
erpnext/stock/doctype/warehouse/warehouse.py
portal/templates/sale.html
portal/utils.py
selling/doctype/sales_order/templates/pages/order.py
selling/utils/cart.py
selling/utils/product.py
utilities/demo/demo_docs/Fiscal_Year.csv
utilities/demo/make_demo.py
2014-01-24 21:44:36 +05:30
Nabin Hait
93eab5521c
Minor fix in path
2014-01-23 17:58:03 +05:30
Nabin Hait
5ae6a61c4d
Fixes related to appifing shopping cart
2014-01-23 15:33:30 +05:30
Rushabh Mehta
f96bcf943b
added explicit delete perimssions
2014-01-20 17:52:13 +05:30
Nabin Hait
5c6d13a0df
Fixed conflict while merging with develop branch
2014-01-20 17:18:16 +05:30
Nabin Hait
dc15b4fa8a
Fixed conflict while merging with develop brnach
2014-01-20 16:48:49 +05:30
Nabin Hait
f6cf5e0f43
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-cleanup
2014-01-06 17:36:04 +05:30
Akhilesh Darjee
e27717261d
merge conflict fixed
2014-01-03 18:18:31 +05:30
Akhilesh Darjee
57738a0ff3
flat discount replaced to discount amount
2014-01-03 18:15:07 +05:30
Rushabh Mehta
b09d9dabc5
started cleanup of address / contact calls - partly fixed for customer, to fix shipping_address, get_pos_values, for all supplier transactions
2014-01-02 11:47:23 +05:30
Nabin Hait
06720dfb90
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-wip
2014-01-01 10:47:18 +05:30
Nabin Hait
a2e0a9b05f
Fliend rearrangemet in tables
2014-01-01 10:45:42 +05:30
Nabin Hait
6260b58a0a
Merge pull request #1253 from nabinhait/4.0.0-wip
...
4.0.0 wip
2013-12-31 21:13:45 -08:00
Anand Doshi
9a4a13cb73
Moved Portal and Shopping Cart to Shopping Cart app, and some minor fixes
2013-12-31 17:38:21 +05:30
Nabin Hait
139aa71666
Fixed conflict while merging with master
2013-12-31 16:09:22 +05:30
Nabin Hait
d3f04d754a
General ledger path fixed
2013-12-31 16:04:48 +05:30
Nabin Hait
432b86344e
Validate account with reference voucher if against voucher mentioned
2013-12-31 15:07:58 +05:30
Akhilesh Darjee
d203aea7c2
[flat discount] flat discount implemented on sales cycle
2013-12-27 17:49:57 +05:30
Anand Doshi
8e332ffd16
Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions
...
Conflicts:
erpnext/accounts/page/accounts_browser/accounts_browser.css
erpnext/controllers/buying_controller.py
erpnext/manufacturing/doctype/production_order/production_order.py
erpnext/patches/patch_list.py
erpnext/selling/doctype/customer/customer.txt
erpnext/selling/doctype/sales_order/sales_order.py
erpnext/selling/doctype/sales_order/test_sales_order.py
erpnext/setup/doctype/features_setup/features_setup.txt
erpnext/stock/doctype/stock_entry/test_stock_entry.py
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
startup/query_handlers.py
2013-12-26 19:12:51 +05:30
Rushabh Mehta
caa4380d49
Merge with 3.3.8
2013-12-26 11:07:58 +05:30
Rushabh Mehta
54047780fc
Merge with 3.3.8
2013-12-26 11:07:46 +05:30
Rushabh Mehta
df200f305b
Redesigned templates. Now all templates must be inside templates/pages templates/generators
2013-12-25 15:19:22 +05:30
Rushabh Mehta
2b08985e16
Translations redesigned webnotes/wnframework#351
2013-12-19 18:27:48 +05:30
Rushabh Mehta
c652a6254f
Rewrote hooks for scheduler, notifications, boot, session, login, webpage webnotes/wnframework#351
2013-12-16 12:48:38 +05:30
Rushabh Mehta
6de403f2be
added manifest, hooks and fixed requires webnotes/wnframework#351
2013-12-13 14:10:14 +05:30
Rushabh Mehta
1f84799f2d
install, web serving, session booting webnotes/wnframework#351
2013-12-12 19:12:19 +05:30
Rushabh Mehta
d2dd83c3a3
fixed template loader webnotes/wnframework#351
2013-12-12 13:57:58 +05:30
Rushabh Mehta
afea58b7a1
moved modules inside erpnext folder
2013-12-11 10:43:52 +05:30
Rushabh Mehta
2fa2f7178d
moved directory structure
2012-09-24 19:13:42 +05:30
Rushabh Mehta
09d84b6575
Stock Ageing & release of Analytics
2012-09-21 19:46:24 +05:30
Rushabh Mehta
f200c5296d
added sales analytics
2012-09-21 15:19:40 +05:30
Rushabh Mehta
6ca8054d55
added stock analytics
2012-09-20 19:03:14 +05:30
Rushabh Mehta
b803cbab3d
Merge branch 'master' of github.com:webnotes/erpnext
2012-09-19 16:48:30 +05:30
Rushabh Mehta
4573515899
added graphs in stock ledger and general ledger
2012-09-19 16:41:19 +05:30
Nabin Hait
2d52bf6a4b
Merge branch 'master' of github.com:webnotes/erpnext
2012-09-19 16:06:21 +05:30
Nabin Hait
757a785872
sales/ pur invoice listview fix
2012-09-19 16:06:03 +05:30
Anand Doshi
8bdfaa3438
msgprint fix, company abbreviation length validation
2012-09-19 12:41:06 +05:30
Nabin Hait
684de08120
Merge branch 'master' of github.com:webnotes/erpnext
2012-09-19 12:22:24 +05:30
Nabin Hait
6a1e40bb46
Date validation in bank reco
2012-09-19 12:21:59 +05:30
Rushabh Mehta
6a6b1de7cd
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-09-19 12:01:54 +05:30
Rushabh Mehta
823c021e9c
added index patch and updated general_ledger
2012-09-19 12:01:01 +05:30
Nabin Hait
27ec8f1e26
pull all entry of bank where clearance date not mentioned in bank reconciliation
2012-09-19 12:00:11 +05:30
Nabin Hait
6e9f1469d9
pull all entry of bank where clearance date not mentioned in bank reconciliation
2012-09-19 11:55:44 +05:30
Nabin Hait
52c595dbf1
pull all entry of bank where clearance date not mentioned in bank reconciliation
2012-09-19 11:45:59 +05:30
Rushabh Mehta
eb8673ecc6
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-09-18 18:52:38 +05:30
Rushabh Mehta
2ad0d424a9
Stock Ledger Report
2012-09-18 18:52:05 +05:30
Nabin Hait
9a90c89b3f
removed duplicate function from sales invoice
2012-09-18 13:37:27 +05:30
Anand Doshi
6b52d77c76
Merge branch 'unicode' of github.com:webnotes/erpnext into unicode
2012-09-17 21:24:39 +05:30
Rushabh Mehta
4156523175
added flot for graphs in report_grid
2012-09-17 19:10:36 +05:30
Anand Doshi
6450b12881
fix in permissions of role 'All'. Fix in Credit Days and Credit Limit permissions in Customer form
2012-09-17 11:34:24 +05:30
Rushabh Mehta
f16b28b92b
moved chart_of_accounts as GridReport
2012-09-17 11:05:59 +05:30
Rushabh Mehta
4ce6b60fce
updates to general ledger, todo
2012-09-17 10:04:07 +05:30
Rushabh Mehta
cfb5466d30
added export to reports using downloadify
2012-09-14 18:12:17 +05:30
Rushabh Mehta
c6369046a1
merge
2012-09-14 11:09:46 +05:30
Nabin Hait
9d3f8b9f59
Merge branch 'master' of github.com:webnotes/erpnext
2012-09-14 10:18:09 +05:30
Nabin Hait
266ee64dc7
rebuild account tree before reposting acocunt balance
2012-09-14 10:17:46 +05:30
Rushabh Mehta
95e4e1418d
created grid report, report dump and general ledger report
2012-09-13 19:40:56 +05:30
Rushabh Mehta
93e9fdfe48
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-09-13 12:00:54 +05:30
Rushabh Mehta
4a91f29d0f
updates to gzip, chart of accounts
2012-09-13 11:59:32 +05:30
Rushabh Mehta
fd1c166f5b
late loading js (require) files in localStorage, brought back versions (simpler)
2012-09-13 10:21:29 +05:30
Rushabh Mehta
24ebe3ffdd
merge with master
2012-09-12 19:07:07 +05:30
Rushabh Mehta
588a98a10f
fixes to chart_of_accounts, added opening + pl condition
2012-09-12 19:00:14 +05:30
Rushabh Mehta
aeb5c0fe70
Merge branch 'master' of github.com:webnotes/erpnext
2012-09-12 18:15:26 +05:30
Rushabh Mehta
0fa8e33835
chart of accounts: balances calculation
2012-09-12 18:14:12 +05:30
Rushabh Mehta
ad37f276da
Created Chart of Accounts using Slick Grid and Tree
2012-09-12 17:13:36 +05:30
Nabin Hait
b146353db2
Merge branch 'unicode' of github.com:webnotes/erpnext into unicode
2012-09-12 16:15:09 +05:30
Nabin Hait
5337ce8d02
period closing voucher issue fixed
2012-09-12 16:14:23 +05:30
Anand Doshi
d29e06852d
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-09-12 15:33:50 +05:30
Nabin Hait
6a6cf5e573
parent account mandatory validation
2012-09-12 15:26:56 +05:30
Nabin Hait
8fdaa4dd66
Merge branch 'unicode' of github.com:webnotes/erpnext into unicode
2012-09-12 14:43:09 +05:30
Nabin Hait
eff2907911
error fixed in period closing entry
2012-09-12 14:42:25 +05:30
Anand Doshi
ce946afb67
Merge branch 'master' of github.com:webnotes/erpnext into unicode
...
Conflicts:
public/js/all-app.js
2012-09-10 14:18:17 +05:30
Anand Doshi
bf8f343da7
check match conditions for companies list in chart of accounts/cost center
2012-09-10 14:13:01 +05:30
Anand Doshi
0dab087be1
Merge branch 'master' of github.com:webnotes/erpnext into unicode
...
Conflicts:
erpnext/accounts/doctype/sales_invoice/sales_invoice.txt
public/js/all-app.js
2012-09-10 11:31:18 +05:30
Nabin Hait
f28f4c7a89
section hide_unhide issue fixed
2012-09-07 11:59:05 +05:30
Anand Doshi
f03e3bb06b
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-09-06 07:55:19 +05:30
Anand Doshi
e642805882
changed date displayed in transaction listing from modified date to transaction/posting date
2012-09-03 13:32:25 +05:30
Anand Doshi
fa97e8c783
Merge branch 'master' of github.com:webnotes/erpnext into unicode
...
Conflicts:
erpnext/accounts/search_criteria/cash_flow_statement/__init__.py
erpnext/accounts/search_criteria/cash_flow_statement/cash_flow_statement.py
public/js/all-app.js
2012-08-31 12:09:02 +05:30
Nabin Hait
245f920772
removed cash flow statement
2012-08-31 11:01:21 +05:30
Anand Doshi
d0fcdf6ec1
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-08-23 18:34:46 +05:30
Anand Doshi
763e4c93bc
added permission checking to show add child, edit and view ledger links
...
in chart of accounts
2012-08-23 18:34:04 +05:30
Anand Doshi
297f37da03
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-08-22 14:59:14 +05:30
Nabin Hait
fd3f24f4be
customer name should come in recurring invoice print format instead of customer id
2012-08-20 11:43:55 +05:30
Anand Doshi
5fc48f566f
Merge branch 'master' of github.com:webnotes/erpnext into unicode
...
Conflicts:
erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt
2012-08-17 11:48:34 +05:30
Nabin Hait
0170b2b4bc
default purchase taxes and charges master will be automatically fetched in pur transactions
2012-08-17 11:00:15 +05:30
Nabin Hait
7e555e9f78
Update erpnext/accounts/doctype/cost_center/cost_center.py
2012-08-14 16:42:30 +05:30
Nabin Hait
f039c8b58f
get_query for invoice in c-form
2012-08-14 15:38:17 +05:30
Anand Doshi
241437995f
Merge branch 'master' of github.com:webnotes/erpnext into unicode
...
Conflicts:
erpnext/setup/doctype/company/company.txt
2012-08-10 12:58:48 +05:30
Nabin Hait
4d0cba8249
Merge branch 'master' of github.com:webnotes/erpnext
2012-08-09 16:24:47 +05:30
Nabin Hait
cd4918736a
error fixed in account browser
2012-08-09 16:24:20 +05:30
Anand Doshi
63fee973d7
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-08-09 11:34:47 +05:30
Anand Doshi
c4df355edc
removed msgprint in get_pos_details of sales invoice
2012-08-09 11:33:56 +05:30
Rushabh Mehta
49dc5da0dc
refactor unicode changes and merge with master with refactored email
2012-08-03 16:02:24 +05:30
Nabin Hait
8292691470
stock repost patch
2012-08-03 08:39:17 +05:30
Anand Doshi
396628e7ea
Merge branch 'master' of github.com:webnotes/erpnext into unicode
...
Conflicts:
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
erpnext/patches/patch_list.py
2012-07-27 14:45:24 +05:30
Nabin Hait
4572182939
Merge branch 'master' of github.com:webnotes/erpnext
2012-07-27 10:54:43 +05:30
Nabin Hait
3d72da568d
SO and DN mandatory only for stock item if made mandatory in global defaults
2012-07-27 10:51:51 +05:30
Rushabh Mehta
0fa628bf86
Merge branch 'master' of github.com:webnotes/erpnext into unicode
...
Conflicts:
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
erpnext/patches/patch_list.py
public/js/report-legacy.js
2012-07-26 15:46:13 +02:00
Anand Doshi
80b8393338
fixes in email validation for recurring invoice
2012-07-26 19:01:16 +05:30
Nabin Hait
e8ff96565c
validate notification_email_ids in recurring invoice and if user is administrator set email id from profile
2012-07-24 10:59:31 +05:30
Nabin Hait
e9a62d1236
reload trial balance report
2012-07-23 11:46:37 +05:30
Anand Doshi
7118086658
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-07-23 11:28:10 +05:30
Nabin Hait
454e268109
Recurring Invoice repititive mail sending issue fixed
2012-07-20 17:17:32 +05:30
Anand Doshi
486f9dfcec
added unicode_literals import at start of each file
2012-07-19 13:40:31 +05:30
Anand Doshi
5756630efb
Merge branch 'master' of github.com:webnotes/erpnext into dev
...
Conflicts:
erpnext/stock/doctype/delivery_note/delivery_note.py
public/js/all-app.js
2012-07-18 20:31:37 +05:30
Anand Doshi
249659d673
Changed file names from listview.js to doctype_name_list.js
2012-07-18 20:25:58 +05:30
Anand Doshi
f2f5c94c41
Default Currency specification for Customer and Supplier
...
This will get fetched in sales and purchase transactions respectively.
Fix in sales order list view
2012-07-18 20:13:52 +05:30
Nabin Hait
a25ebe3dbf
Conversion rate fieldtype set as float (from currency)
2012-07-16 16:34:28 +05:30
Rushabh Mehta
2eef40bf1e
get_field > wn.meta.get_docfield
2012-07-16 14:16:57 +05:30
Rushabh Mehta
8cbbab2e75
Merge branch 'dev' of github.com:webnotes/erpnext into dev
2012-07-12 18:01:31 +05:30
Rushabh Mehta
4feae61b62
fixes to taxes and charges master and naming_series
2012-07-12 16:01:20 +05:30
Nabin Hait
70db682a9a
fixed conflict in setup control
2012-07-12 11:47:40 +05:30
Rushabh Mehta
5faf37f312
item group cleanup
2012-07-12 11:33:00 +05:30
Rushabh Mehta
cda9732f51
price list cleanup
2012-07-11 17:29:46 +05:30
Rushabh Mehta
3a0f191658
cleaned up fiscal_year, currency and added select-all + help in doclistview
2012-07-11 16:35:39 +05:30
Nabin Hait
3b0f5dddea
fiscal_year_closed and abbr removed from code
2012-07-11 15:14:06 +05:30
Rushabh Mehta
9acf463427
budget distribution cleanup and formatting of markdown
2012-07-11 14:39:33 +05:30
Rushabh Mehta
e3dd54c220
Merge branch 'dev' of github.com:webnotes/erpnext into dev
2012-07-11 13:19:36 +05:30
Rushabh Mehta
e57267f79a
added patch for account and cleanups to breadcrumbs and msgprint
2012-07-11 13:18:58 +05:30
Nabin Hait
21fdff01e2
Merge branch 'dev' of github.com:webnotes/erpnext into dev
2012-07-11 13:16:38 +05:30
Nabin Hait
9e5059f6b9
packing list introduced in pos invoice
2012-07-11 13:15:57 +05:30
Anand Doshi
e2cddd4e78
Merge branch 'dev' of github.com:webnotes/erpnext into dev
2012-07-11 12:09:41 +05:30
Nabin Hait
e4e78b469a
Merge branch 'dev' of github.com:webnotes/erpnext into dev
2012-07-11 11:54:08 +05:30
Rushabh Mehta
bf96499c0e
account cleanup, added toggle_fields in cur_frm
2012-07-11 09:51:18 +05:30
Rushabh Mehta
d6814dde29
account cleanup started
2012-07-10 18:38:59 +05:30
Nabin Hait
c296764cfe
repost button removed from closing entry voucher
2012-07-10 18:25:59 +05:30
Nabin Hait
04aa191869
freezed account allowed in closing entry
2012-07-10 18:18:03 +05:30
Rushabh Mehta
5281e350fb
cost center cleanup
2012-07-10 18:16:09 +05:30
Nabin Hait
29d7641206
fixed issue in period closing voucher: consider freezed account for closing
2012-07-10 18:12:00 +05:30
Rushabh Mehta
1ee2a5ac12
cost center cleanup + grid css
2012-07-10 17:22:20 +05:30
Nabin Hait
0aec0e1a63
repost balance button removed from period closing voucher
2012-07-10 14:24:45 +05:30
Nabin Hait
7c0b893b1f
mandatory validation in cost center
2012-07-10 14:18:35 +05:30
Nabin Hait
969622dcef
mandatory validation in cost center
2012-07-10 14:11:01 +05:30
Anand Doshi
95a822c701
Fetch Customer's Item Code in Sales Transaction
2012-07-09 11:09:07 +05:30
Anand Doshi
8c90f12967
changed label of included in print rate to Is this Tax included in Basic Rate?
2012-07-04 13:30:13 +05:30
Anand Doshi
c4cae8d561
Merge branch 'master' into dev
2012-06-29 19:07:29 +05:30
Anand Doshi
54b7235705
formatted money in chart of accounts tree
2012-06-29 19:07:20 +05:30
Anand Doshi
365e0c5f13
Merge branch 'master' into dev
2012-06-29 19:04:10 +05:30
Anand Doshi
351352670e
formatted money in chart of accounts tree
2012-06-29 19:03:59 +05:30
Anand Doshi
d4425cc57d
Merge branch 'master' into dev
...
Conflicts:
erpnext/support/doctype/maintenance_visit/maintenance_visit.py
2012-06-27 14:13:34 +05:30
Nabin Hait
b81aa88091
Lease agreement link removed from account home page
2012-06-27 12:00:24 +05:30
Anand Doshi
81fa802e09
Merge branch 'master' into dev
2012-06-25 20:06:54 +05:30
Anand Doshi
8ae5ba9abf
fixes related to --> clear locals and then sync locals when whole doclist is passed
2012-06-25 20:05:35 +05:30
Nabin Hait
8b14617dce
run view ledger report through set_route
2012-06-25 13:15:59 +05:30
Nabin Hait
33dcbc096a
error fixed in cost center wise expense report
2012-06-22 14:34:46 +05:30
Nabin Hait
bceec1cbef
error fixed in cost center wise expense report
2012-06-22 14:32:56 +05:30
Nabin Hait
1f5a58eed7
listview of sales invoice
2012-06-22 14:19:06 +05:30
Nabin Hait
486718250e
listview of purchase invoice and deletion of supplier
2012-06-22 14:14:04 +05:30
Nabin Hait
318eab813c
delete customer account on deletion of customer record
2012-06-22 13:35:13 +05:30
Nabin Hait
0480153042
error fixed in sales register
2012-06-19 18:07:03 +05:30
Nabin Hait
11de3ec952
fixed error in purchase register
2012-06-19 18:03:31 +05:30
Nabin Hait
28447e84c2
Update master
2012-06-18 11:03:51 +05:30
Nabin Hait
8eadf09e99
recurring invoice : quarterly, half-yearly and yearly
2012-06-17 21:48:33 +05:30
Rushabh Mehta
4c56275d26
appframe is now heading
2012-06-14 11:05:09 +05:30
Nabin Hait
8afa88b906
fixed utf8 error in multi ledger export
2012-06-11 17:48:40 +05:30
Nabin Hait
856442e33b
taxes query changes
2012-06-08 12:13:00 +05:30
Nabin Hait
2e3579a4eb
Item Barcode implemented
2012-06-07 19:09:17 +05:30
Nabin Hait
91034af0dc
Get Query changes for tax account: allowed account type income/expense
2012-06-07 12:12:08 +05:30
Nabin Hait
252a7a189b
Account type=Income/Expense allowed in income/expense account searching in sales/pur invoice
2012-06-05 15:27:12 +05:30
Nabin Hait
6c34e1411f
Flexible invoice period in recurring invoice
2012-06-04 16:21:25 +05:30
Nabin Hait
bc8e9d7a34
Flexible invoice period in recurring invoice
2012-06-04 16:18:38 +05:30
Nabin Hait
6ea87a42a8
convert to group/ledger button hide/unhide issue fixed
2012-06-04 14:04:36 +05:30
Nabin Hait
aaab084a12
uom field added in pur invoice item table
2012-06-04 12:10:43 +05:30
Nabin Hait
d2301f9569
uom field added in pur invoice item table
2012-06-04 12:07:45 +05:30
Nabin Hait
765298bc63
uom field added in pur invoice item table
2012-06-04 12:02:56 +05:30
Nabin Hait
e44ebb1ec7
removed available qty validation in pos
2012-05-31 15:22:05 +05:30
Nabin Hait
fe678fd638
balance area only for accounts not for cost center
2012-05-31 13:32:45 +05:30
Nabin Hait
0908b2709b
fixed conflict
2012-05-31 11:49:37 +05:30
Nabin Hait
5c1de3a639
fixed conflict
2012-05-31 11:47:09 +05:30
Nabin Hait
353bc313a6
Link to Sales/accounts browser fixed
2012-05-31 11:43:14 +05:30
Anand Doshi
3b091418ec
allow zero payment in POS Invoice, when cash/bank account is not specified
2012-05-28 18:08:02 +05:30
Anand Doshi
9327bb9585
fix in tag viewing in doclistview
2012-05-23 15:12:22 +05:30
Nabin Hait
86df78aabc
fixed conflict
2012-05-23 11:33:28 +05:30
Nabin Hait
df9f8a363e
Balance on chart of accounts
2012-05-22 16:54:46 +05:30
Nabin Hait
b695f73293
Maintain same rate throughout pur cycle: in global defaults, by default set true
2012-05-22 14:53:40 +05:30
Nabin Hait
86375f089a
Merge branch 'shf_rename'
...
Conflicts:
erpnext/patches/patch_list.py
2012-05-21 15:48:21 +05:30
Nabin Hait
ee2201cc68
forced export limit increased to 2000
2012-05-21 15:13:57 +05:30
Anand Doshi
1aae261490
delete button in doclistview
2012-05-21 14:31:03 +05:30
Nabin Hait
d9742a6a58
on_trash modified for item group, territory, customer group, and sales person
2012-05-21 13:33:09 +05:30
Nabin Hait
c68635d70a
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-18 18:37:28 +05:30
Nabin Hait
3b8d4776a2
company validation
2012-05-18 18:36:56 +05:30
Anand Doshi
00175612ac
Merge branch 'shf_rename'
...
Conflicts:
erpnext/stock/doctype/item/listview.js
2012-05-18 16:50:35 +05:30
Anand Doshi
d49da9bff1
new listviews
2012-05-18 16:49:36 +05:30
Anand Doshi
d643d367ca
Merge branch 'shf_rename'
...
Conflicts:
public/js/all-app.js
public/js/all-web.js
2012-05-18 11:52:31 +05:30
Anand Doshi
fc9145425d
Fixes in Print Formats - discount in description
2012-05-17 18:11:54 +05:30
Anand Doshi
c7e26873c0
Merge branch 'shf_rename'
2012-05-17 15:28:54 +05:30
Anand Doshi
dad93ce8a3
fix in payment reconciliation
2012-05-17 15:28:38 +05:30
Anand Doshi
ae4fc41e61
Merge branch 'shf_rename'
2012-05-16 14:35:15 +05:30