Nabin Hait
56f6d01757
Minor fixes
2014-06-20 19:37:53 +05:30
Nabin Hait
3c946b2a72
validate pricing rule discount with item max discount
2014-06-20 19:07:44 +05:30
Nabin Hait
be50c289f8
validate pricing rule discount with item max discount
2014-06-20 16:19:55 +05:30
Nabin Hait
444f956e7b
Pricing Rule fixes and improvements. Fixes #1795
2014-06-20 16:00:45 +05:30
Anand Doshi
a5cfc59d81
Validate Select field values
2014-06-19 16:05:08 +05:30
Anand Doshi
fd05f458e1
Minor fix in Journal Voucher
2014-06-18 20:55:18 +05:30
Rushabh Mehta
151125e537
fixed for travis
2014-06-18 17:33:01 +05:30
Nabin Hait
4d7c4fc0f4
Get party details fixes
2014-06-18 16:40:59 +05:30
Rushabh Mehta
36881807ed
Merge branch 'wip-4.2' into wip-4.1
2014-06-17 17:36:22 +05:30
Rushabh Mehta
1a18b427a8
make font size smaller for erpnext powered
2014-06-17 16:54:55 +05:30
Rushabh Mehta
69ce97b80a
added print format for general ledger
2014-06-17 16:54:55 +05:30
Anand Doshi
1c5fb9495e
Merge pull request #1806 from nabinhait/v4-hotfix
...
Fixes
2014-06-17 14:54:44 +05:30
Rushabh Mehta
5df521bad5
updated generators for wip-4.2
2014-06-17 14:21:26 +05:30
Anand Doshi
b20de6a3ec
Sales Invoice List: show percent paid as 100% if grand total is 0
2014-06-17 13:58:06 +05:30
Nabin Hait
4ee8704b99
Fixes in financial analytics
2014-06-17 13:52:03 +05:30
Rushabh Mehta
3b7bcf0f4f
make font size smaller for erpnext powered
2014-06-16 14:21:37 +05:30
Rushabh Mehta
03ae32d937
added print format for general ledger
2014-06-16 14:21:37 +05:30
Anand Doshi
205438669a
Removed clear_custom_buttons, pos view switch fix
2014-06-12 15:00:51 +05:30
Anand Doshi
fdfea0c17b
Fixed Recurring Sales Invoice
2014-06-10 17:54:04 +05:30
Nabin Hait
7cba72a0b7
Pricing Rule: price / discount percentage can not be negative
2014-06-10 11:09:21 +05:30
Anand Doshi
cdfa9a371d
Export perm for GL Entry and Stock Ledger Entry
2014-06-09 15:11:17 +05:30
Anand Doshi
b5cefa92fa
Improved Fiscal Year validation messages
2014-06-06 15:10:00 +05:30
Rushabh Mehta
ba83e9cfbe
removed sms control and related cleanup, fixes frappe/erpnext#462
2014-06-05 17:56:42 +05:30
Nabin Hait
c8be8ba42c
function renamed
2014-06-05 15:18:10 +05:30
Nabin Hait
4d4df03f88
Added total debit / credit row in trial balance. Fixes #1313
2014-06-04 19:00:57 +05:30
Nabin Hait
deb6e06336
minor fix
2014-06-04 19:00:56 +05:30
Nabin Hait
1055139c83
get accounts for opening entry
2014-06-04 19:00:56 +05:30
Nabin Hait
b161eea793
Account balance must be debit / credit, validate if balance already in credit / debit. Fixes #1442
2014-06-04 18:57:53 +05:30
Anand Doshi
85479bcbc0
Fixes for apply user permissions and momentjs
2014-06-04 18:15:43 +05:30
Anand Doshi
ec8240e890
Apply User Permissions optional in Script and Query Reports
2014-06-04 17:48:58 +05:30
Anand Doshi
cdc1b640d9
Fixes in user permissions patches
2014-06-04 17:48:56 +05:30
Anand Doshi
a8ce570635
Permission relogication continued
2014-06-04 17:48:53 +05:30
Anand Doshi
fab0904af7
Started permission relogication
2014-06-04 17:48:52 +05:30
Anand Doshi
ffc28faa51
Merge pull request #1744 from rmehta/develop
...
added multiple item select and allow non purchase items in Material Requ...
2014-06-04 17:47:58 +05:30
Rushabh Mehta
b6843f2087
added multiple item select and allow non purchase items in Material Request of type transfer
2014-06-04 13:10:41 +05:30
Nabin Hait
67d8b91690
Fixes in bank reconciliation statement
2014-06-04 11:18:25 +05:30
Nabin Hait
bc7efa6da6
Parent account mandatory for all non-root accounts
2014-06-03 23:02:02 +05:30
Nabin Hait
b15764ef2c
Translation issue fixed in analytics/grid report
2014-06-03 13:02:39 +05:30
Rushabh Mehta
cc37cc83cd
removed section_style
2014-05-31 10:36:41 +05:30
Nabin Hait
47a8670d37
pricing rule testcase fixes
2014-05-30 11:22:12 +05:30
Nabin Hait
ccb9826afd
pricing list tets case fixes
2014-05-30 11:22:12 +05:30
Nabin Hait
ea4aa04cc4
Search query for account cleanup
2014-05-30 11:22:11 +05:30
Nabin Hait
a3dd72a759
Pricing Rule
2014-05-30 11:22:10 +05:30
Nabin Hait
62ec60188b
use build_filter_conditions from db_query. Fixes #1679
2014-05-30 11:22:10 +05:30
Rushabh Mehta
f944e819e9
fixes #1581 and added icons to grid reports
2014-05-27 15:22:04 +05:30
Rushabh Mehta
d82e85d099
fix to pos invoice
2014-05-26 16:01:01 +05:30
Nabin Hait
27b12ef1b6
update account root type patch
2014-05-21 11:53:59 +05:30
Nabin Hait
b5c552faf3
minor fix
2014-05-21 11:53:59 +05:30
Nabin Hait
0e6554edc1
Root Type field added in account and patch for existing accoutns
2014-05-21 11:53:58 +05:30
Nabin Hait
c49b7f8c63
minor fix
2014-05-20 15:07:18 +05:30
Nabin Hait
2e0620e370
Server side onload functionality in multiple docs
2014-05-19 18:15:58 +05:30
Nabin Hait
091b48168e
Journal voucher debit != credit #fraction issue
2014-05-16 19:56:43 +05:30
Pratik Vyas
fa7444ec94
fix shipping rule test cases (copy name with copy_doc)
2014-05-16 15:19:51 +05:30
Anand Doshi
54b7962eb9
Pass frm to open_mapped_doc
2014-05-14 17:38:45 +05:30
Anand Doshi
4c83e407a9
Changed Print Format files to lowercase
2014-05-13 17:58:30 +05:30
Nabin Hait
aade34b0c9
Reports and print formats modified for renamed fields
2014-05-13 16:12:37 +05:30
Nabin Hait
827480fd2b
import, export and report permission in account and pricing rule
2014-05-12 17:45:37 +05:30
Nabin Hait
0ff6e3a6bb
Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix
2014-05-11 12:11:50 +05:30
Nabin Hait
5365108ef9
Test case fixes for pos setting
2014-05-11 12:10:17 +05:30
Anand Doshi
78e9c6ef70
Deprecate Select fields with options as link:
2014-05-09 13:36:13 +05:30
Anand Doshi
f410bd9bf9
Better default permissions, ignore_restrictions for defaults, removed field trash_reason
...
Additions:
Account --> Material User: Read
Cost Center --> Sales User, Purchase User: Read
Mode of Payment --> Accounts User: Read
Supplier --> Material User, Accounts User: Read
Employee --> Employee: Restricted Read
Leave Type --> Employee: Read
Production Order --> Material User: Read
Sales Order --> Material User: Read
Print Heading --> All: Read
Terms and Conditions --> Purchase User, Material User: Read
Territory --> Material User, Maintenance User: Read
Item --> Sales User, Purchase User, Maintenance User, Accounts User: Read
Price List --> Manufacturing User: Read
Purchase Receipt --> Accounts User: Read
Warehouse --> Manufacturing User: Read
2014-05-07 17:20:42 +05:30
Anand Doshi
dc644c37e6
Merge pull request #1597 from anandpdoshi/naming-series-by-fiscal-year
...
Naming series by fiscal year
2014-05-07 11:06:36 +05:30
Anand Doshi
8c2dbab878
Changed default naming series options
...
C-Form: C-FORM-.#####
Purchase Invoice: PINV-.#####
Sales Invoice: SINV-.#####
Purchase Order: PO-.#####
Quality Inspection: QI-.#####
Supplier: SUPP-.#####
Supplier Quotation: SQTN-.#####
Attendance: ATT-.#####
Production Order: PRO-.#####
Installation Note: IN-.#####
Lead: LEAD-.#####
Opportunity: OPTY-.#####
Quotation: QTN-.#####
Sales Order: SO-.#####
Delivery Note: DN-.#####
Item: ITEM-.#####
Material Request: MREQ-.#####
Packing Slip: PS-.#####
Purchase Receipt: PREC-.#####
Stock Entry: STE-.#####
Customer Issue: CI-.#####
Support Ticket: SUP-.#####
Customer: CUST-.#####
Journal Voucher: JV-.#####
2014-05-06 19:43:11 +05:30
Nabin Hait
3190f99ebe
Option for selecting already reconciled entries in bank reconciliation #1310
2014-05-06 16:39:24 +05:30
Nabin Hait
98c2a052e5
Fixes in pricing rule testcases #565
2014-05-05 18:41:41 +05:30
Nabin Hait
0c7e28ec9f
Pricing Rule improvements #565
2014-05-05 11:13:36 +05:30
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
Nabin Hait
7b87a7ec74
fixed pos settings
2012-05-16 14:07:02 +05:30
Anand Doshi
c51c0d38d7
Merge branch 'shf_rename'
2012-05-16 12:28:14 +05:30
Nabin Hait
86dec8da7a
naming series issue fixed in pos settings
2012-05-16 12:20:21 +05:30
Anand Doshi
f295591168
Merge branch 'shf_rename'
2012-05-14 18:03:45 +05:30
Rushabh Mehta
deeae62b18
merge js/css
2012-05-14 15:03:17 +05:30
Nabin Hait
a13b435163
invoice period in print format if recurring invoice
2012-05-14 14:11:56 +05:30
Anand Doshi
07af8f6247
fix in last purchase rate
2012-05-14 13:02:31 +05:30
Anand Doshi
4a3d3d75de
Merge branch 'shf_rename'
...
Conflicts:
erpnext/patches/patch_list.py
2012-05-14 12:53:29 +05:30
Anand Doshi
cec150b487
fixes in last purchase rate
2012-05-11 18:13:53 +05:30
Rushabh Mehta
0eb790a0ae
cleaned up imports, doc
2012-05-11 15:53:37 +05:30
Nabin Hait
956eeb1361
fetch defaults after mapping from prev document
2012-05-11 14:45:02 +05:30
Anand Doshi
df74d30cf1
fix in listview of journal voucher
2012-05-10 19:19:31 +05:30
Anand Doshi
02c0eaf99a
don't show currency in journal voucher's listview
2012-05-10 18:48:15 +05:30
Nabin Hait
6fb498ebcd
changed field position of net total(import)
2012-05-10 14:03:39 +05:30
Anand Doshi
df8b4ab9b1
Merge branch 'cms'
2012-05-10 10:21:29 +05:30
Rushabh Mehta
078867c411
fixes to listview
2012-05-09 16:15:51 +05:30
Nabin Hait
68f9ad31ae
serialized inventory fixes : serial no for sales bom child item and rejected qty
2012-05-09 15:26:27 +05:30
Rushabh Mehta
e45042e011
merge
2012-05-09 12:22:50 +05:30
Nabin Hait
a6b8e84f09
removed whong depends on value
2012-05-08 17:18:40 +05:30
Rushabh Mehta
c22d9e03e7
Merge branch 'shf_rename' of github.com:webnotes/erpnext into cms
2012-05-08 11:02:58 +05:30
Rushabh Mehta
a920943e43
new cms with public folder
2012-05-07 18:00:57 +05:30
Nabin Hait
5f4ca56fd1
Fixes related to renamedt
2012-05-07 11:59:23 +05:30
Nabin Hait
8cf9934b93
Trend analyzer issue fixed
2012-05-04 12:52:56 +05:30
Nabin Hait
978a1e0e46
field rearranged in sales invoice
2012-05-04 11:57:55 +05:30
Rushabh Mehta
7f5791ba1e
jv, search fix
2012-05-04 10:10:30 +05:30
Nabin Hait
32826a8cf1
fixes in customerwise price list
2012-05-03 13:10:34 +05:30
Rushabh Mehta
acd0769098
list in listview and sales order fix
2012-05-03 10:20:38 +05:30
Rushabh Mehta
d5e1031f42
floating logo on left
2012-05-02 17:44:59 +05:30
Nabin Hait
ab96d12086
fixes in customerwise price list
2012-05-02 12:19:33 +05:30
Nabin Hait
07c3b399f6
field arrngement fix
2012-05-02 10:00:03 +05:30
Nabin Hait
722bbd8ef0
JV fix
2012-05-01 16:36:51 +05:30
Nabin Hait
796505a83e
field arrangement in purchase and stock cycle
2012-05-01 16:26:16 +05:30
Nabin Hait
57d7c815d2
field arrangement in sales cycle
2012-05-01 12:35:12 +05:30
Nabin Hait
926f46f04a
Fixed conflict while merging with master
2012-05-01 11:51:08 +05:30
Nabin Hait
d58da50f50
Merge branch 'master' of github.com:webnotes/erpnext
2012-05-01 11:37:45 +05:30
Nabin Hait
1e335f3272
fixes in validattion of debit to account with customer in sales invoice
2012-05-01 10:53:50 +05:30
Nabin Hait
41c62727c7
fixes in validattion of debit to account with customer in sales invoice
2012-05-01 10:45:47 +05:30
Rushabh Mehta
79a664b4dc
cleaned up lead, opportunity, jv
2012-04-30 16:12:03 +05:30
Nabin Hait
0d1daa8875
fld order change
2012-04-27 13:56:58 +05:30
Nabin Hait
a6b7886175
resolved conflict while merging with master
2012-04-26 13:02:36 +05:30
Nabin Hait
50c799880a
Merge branch 'master' of github.com:webnotes/erpnext
2012-04-26 12:47:30 +05:30
Nabin Hait
04a276c934
Error fixed in gl netry when negative entry and cancel event
2012-04-25 16:08:45 +05:30
Nabin Hait
8f9a953931
Update erpnext/accounts/doctype/ledger_balance_export/ledger_balance_export.py
2012-04-23 19:00:39 +05:30
Nabin Hait
e848300958
patch list modified
2012-04-23 18:24:22 +05:30
Nabin Hait
2bbb086b10
Update erpnext/accounts/doctype/rv_detail/rv_detail.txt
2012-04-23 17:57:18 +05:30
Nabin Hait
b743bb6c10
ledger bal export format changed
2012-04-23 14:03:07 +05:30
Nabin Hait
51834a45a7
purchase invoice with write off feature
2012-04-23 12:47:12 +05:30
Nabin Hait
f7c506d69e
fixed conflict while merging with master branch
2012-04-20 13:58:43 +05:30
Nabin Hait
e72ae2a19b
fixed conflict
2012-04-20 13:41:09 +05:30
Nabin Hait
0788570ce7
automatically write off feature in sales invoice
2012-04-20 13:31:05 +05:30
Nabin Hait
239e79038f
Customer/customer group wise price list
2012-04-20 10:25:03 +05:30
Anand Doshi
f642168a26
hr home: changed Allocate Leaves --> Leave Allocation Tool
2012-04-18 18:35:30 +05:30
Anand Doshi
385380125b
fixes in customize form, naming series form loading
2012-04-18 16:04:02 +05:30
Nabin Hait
5da9d56047
removed voucher date filter
2012-04-17 18:05:58 +05:30
Anand Doshi
44f16eaefa
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-17 13:00:01 +05:30
Anand Doshi
b9e9197e5f
fix in doclistview - check if _user_tags exists before rendering
2012-04-17 12:59:18 +05:30
Rushabh Mehta
38bdf6c5e7
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-17 12:41:04 +05:30
Rushabh Mehta
2146fd17e7
new sales_browser
2012-04-17 12:40:37 +05:30
Anand Doshi
24e18569d9
fixes in install docs for roles
2012-04-17 11:45:35 +05:30
Anand Doshi
45a4edc9c9
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
...
Conflicts:
css/all-app.css
version.num
2012-04-17 11:19:15 +05:30
Rushabh Mehta
71085592a4
fixed account_browser
2012-04-16 18:36:46 +05:30
Rushabh Mehta
6820dbf72d
framework build
2012-04-16 13:33:14 +05:30
Rushabh Mehta
f465b4fa76
merge
2012-04-13 19:06:05 +05:30
Rushabh Mehta
850c928a02
started rewrite of accounts browser
2012-04-13 19:04:55 +05:30
Anand Doshi
a202f00dc0
fixes in accounts
2012-04-13 16:03:27 +05:30
Nabin Hait
1c9061eff6
fixed conflict using theirs
2012-04-13 14:24:35 +05:30
Nabin Hait
6c615d9527
Merge branch 'master' of github.com:webnotes/erpnext
2012-04-13 14:14:39 +05:30
Anand Doshi
3abe9bd018
fixes in fieldnames and hide unnecessary fields in jv
2012-04-13 12:36:44 +05:30
Anand Doshi
b641ed2a1e
Added doc_type to JV Print Formats
2012-04-13 12:27:56 +05:30
Rushabh Mehta
d76146372e
merge
2012-04-13 12:01:23 +05:30
Rushabh Mehta
97ae17eaf7
merge
2012-04-13 11:42:56 +05:30
Rushabh Mehta
f1264a7f76
listing, module pages in appframe
2012-04-13 11:41:43 +05:30
Anand Doshi
83808267d5
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-13 11:40:38 +05:30
Anand Doshi
1c2ac00a82
fixes in sales cycle
2012-04-13 11:38:01 +05:30
Anand Doshi
f31fc22ef0
fixes in doctype
2012-04-13 11:37:19 +05:30
Nabin Hait
a73b2965aa
cleanup and fixes
2012-04-13 11:02:26 +05:30
Anand Doshi
25bc68c7b2
fix in field names
2012-04-12 14:08:43 +05:30
Anand Doshi
654f6bfa85
fixes
2012-04-12 12:15:35 +05:30
Anand Doshi
9e6af24269
fixes in button function calling
2012-04-11 19:07:02 +05:30
Anand Doshi
2424387651
fixes after sync testing
2012-04-10 19:14:37 +05:30
Nabin Hait
af094b9daf
ledger balance export report in new format
2012-04-10 18:07:36 +05:30
Anand Doshi
9afb57ffb2
Syntax error fix in c_form.txt
2012-04-09 12:23:36 +05:30
Anand Doshi
87a2c5cc69
Merge branch 'master' of github.com:webnotes/erpnext into shf_rename
...
Conflicts:
erpnext/accounts/doctype/c_form/c_form.txt
erpnext/patches/patch_list.py
erpnext/setup/doctype/permission_control/permission_control.py
2012-04-09 12:14:53 +05:30
Anand Doshi
82042f1cff
fixes after sync
2012-04-06 17:54:17 +05:30
Nabin Hait
7da6ebc9af
Attachment option and total invoiced amt added in c-form
2012-04-06 17:30:53 +05:30
Nabin Hait
05e4fc6eb6
Chart of account/cc link only for accounts user and account manager role in account home page
2012-04-06 15:19:02 +05:30
Anand Doshi
7e0479bc4c
cleanup of search criteria
2012-04-05 18:27:56 +05:30
Anand Doshi
fa0cd89a7c
change from labels to fieldname in cur_frm.cscript
2012-04-05 13:03:35 +05:30
Anand Doshi
5112b5b6b8
rerun of rename_dt
2012-04-02 19:12:29 +05:30
Rushabh Mehta
c7f1e5a54a
patch fixes
2012-04-02 14:24:35 +05:30
Rushabh Mehta
5475a3ca66
patch fixes
2012-04-02 14:06:46 +05:30
Anand Doshi
0442bc5d63
fix in patch list
2012-04-02 13:09:20 +05:30
Anand Doshi
c88ae2be4d
rename dt second cut
2012-03-30 18:18:36 +05:30
Anand Doshi
fedfd89e4a
rename dt first cut
2012-03-30 12:29:06 +05:30
Anand Doshi
37fb9c8f27
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into shf_rename
...
Conflicts:
version.num
2012-03-29 15:35:08 +05:30
Anand Doshi
7ff696fb12
Merge branch 'renamedt' into shf_rename
...
Conflicts:
erpnext/patches/patch_list.py
2012-03-29 15:31:17 +05:30
Anand Doshi
fddb782a82
Merge branch 'renamedt' of github.com:webnotes/erpnext into renamedt
2012-03-29 15:28:16 +05:30
Nabin Hait
dc8ce0190d
Merge branch 'master' into renamedt
2012-03-29 11:53:02 +05:30
Anand Doshi
9767f79845
fix in Sales Order-Receivable Voucher Mapper
2012-03-28 19:25:29 +05:30
Rushabh Mehta
635f359a71
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
2012-03-28 15:18:28 +02:00
Rushabh Mehta
43d64c6116
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-28 15:17:59 +02:00
Anand Doshi
2f74d2e7bd
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-28 18:34:50 +05:30
Anand Doshi
779a365420
fix in print hide of amount in words
2012-03-28 18:31:26 +05:30
Anand Doshi
18ffd2a1b8
Merge branch 'master' into handlerupdate
2012-03-28 17:56:33 +05:30
Anand Doshi
c9456c18dc
listviews
2012-03-28 17:48:30 +05:30
Rushabh Mehta
0dfa140b7d
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-28 10:42:20 +02:00
Nabin Hait
e6340f26c2
mapper fix in DN_RV
2012-03-28 14:11:31 +05:30
Rushabh Mehta
bb769c5461
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-28 08:04:17 +02:00
Nabin Hait
6ed0450dba
reload mapper for checking ref value
2012-03-28 11:32:44 +05:30
Anand Doshi
2513e50dc4
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into shf_merge
...
Conflicts:
erpnext/website/doctype/style_settings/style_settings.txt
version.num
2012-03-27 19:37:10 +05:30
Anand Doshi
a30fbd004e
merge of sync handler and sync_file_db - first cut
2012-03-27 19:31:38 +05:30
Nabin Hait
a0a3ca3178
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-27 17:09:03 +05:30
Anand Doshi
3107096890
Merge branch 'master' of github.com:webnotes/erpnext into shf_merge
2012-03-27 15:02:38 +05:30
Rushabh Mehta
91c79305e8
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-26 12:11:22 +02:00
Nabin Hait
854935f12c
added docstatus in item get_query in PV
2012-03-26 15:40:56 +05:30
Anand Doshi
c009450ef0
fix in item addition - details fetching
2012-03-26 14:17:30 +05:30
Anand Doshi
5f9501d4d8
Merge branch 'sync_file_db' into shf_merge
...
Conflicts:
erpnext/projects/doctype/project/project.txt
2012-03-23 14:51:35 +05:30
Nabin Hait
f88326ba3f
sync ref db
2012-03-22 15:07:05 +05:30
Rushabh Mehta
27cf13b541
merge
2012-03-22 11:37:56 +05:30
Rushabh Mehta
3f46696db2
removed slider ui
2012-03-22 11:37:08 +05:30
Nabin Hait
f676824791
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-21 17:08:35 +05:30
Rushabh Mehta
2d229b423e
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-21 12:28:42 +01:00
Nabin Hait
d551281cbe
cdt not defined fixed
2012-03-21 16:57:08 +05:30
Nabin Hait
0ad2ef2111
sync with respect to file
2012-03-21 15:02:39 +05:30
Nabin Hait
e8da15cb5b
sync ref file
2012-03-21 12:45:14 +05:30
Rushabh Mehta
f74ef4c64b
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
2012-03-21 07:18:41 +01:00
Rushabh Mehta
a665c1f60d
stylefixes and listviews
2012-03-21 11:47:58 +05:30
Rushabh Mehta
dad4e3ebac
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-21 07:17:28 +01:00
Nabin Hait
5f04061291
changes in recurring invoice print format
2012-03-21 11:47:00 +05:30
Rushabh Mehta
454c6ac716
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-21 05:42:31 +01:00
Rushabh Mehta
437c1b512c
listview update and form fix
2012-03-20 18:45:28 +05:30
Nabin Hait
ba62cf3b5a
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-20 17:40:16 +05:30
Nabin Hait
39c26f4580
billing period in recurring sales invoice mail
2012-03-20 17:39:48 +05:30
Nabin Hait
ceb9f41f15
lead organization fld added in quotation for printing: patch
2012-03-20 17:04:32 +05:30
Anand Doshi
d05aad6474
fix in POS invoice
2012-03-20 12:33:02 +05:30
Anand Doshi
4f5e92a06c
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-20 12:17:50 +05:30
Anand Doshi
3401086d66
POS Invoice fix
2012-03-20 12:07:18 +05:30
Rushabh Mehta
d48417c93b
slide navigation fixes
2012-03-19 18:42:13 +05:30
Rushabh Mehta
ffe9d358e8
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-19 12:40:07 +01:00
Nabin Hait
65ad3b1a0f
Update erpnext/accounts/search_criteria/trial_balance/trial_balance.py
2012-03-19 17:09:14 +05:30
Rushabh Mehta
6498cee998
fixed conflict
2012-03-19 09:01:16 +01:00
Nabin Hait
b6cd3316c4
error fixed in lease receipts client wise
2012-03-19 13:27:06 +05:30
Anand Doshi
f02c9e7b6c
fix in due_date fetching for receivable voucher
2012-03-19 11:43:24 +05:30
Rushabh Mehta
7afaa8665d
major reworking of page navigation
2012-03-16 18:28:09 +05:30
Rushabh Mehta
2438de4c9b
fixed tags in list2
2012-03-15 16:43:46 +05:30
Rushabh Mehta
08b670bddd
listing with stats
2012-03-14 19:06:20 +05:30
Rushabh Mehta
9a1bdf7224
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-07 18:20:33 +05:30
Nabin Hait
00260870d1
fixes in rv
2012-03-07 12:50:55 +05:30
Rushabh Mehta
0dd5da2299
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-06 18:41:52 +05:30
Rushabh Mehta
15da133de9
removed
2012-03-06 18:41:11 +05:30
Nabin Hait
b659457b4d
Removed def value from invoice naming series
2012-03-06 11:07:24 +05:30
Nabin Hait
cf9c4c45a5
export /import fld hide issue, discount issue
2012-03-05 15:21:35 +05:30
Nabin Hait
9cee59cd05
field order changed
2012-03-05 10:54:54 +05:30
Nabin Hait
89a30ff7dc
Company 'all' removed from financial statements
2012-03-02 17:15:01 +05:30
Nabin Hait
0d155a9135
print hide issue
2012-03-02 14:57:44 +05:30
Nabin Hait
88986ca007
column break print hide issue
2012-03-02 12:29:08 +05:30
Nabin Hait
db4af96388
issue fixed in pos
2012-03-01 18:47:51 +05:30
Nabin Hait
e3ce5b4e0c
voucher date removal issue fixed
2012-03-01 17:37:36 +05:30
Nabin Hait
be0b090d27
voucher date removal issue fixed
2012-03-01 17:31:51 +05:30
Anand Doshi
496d9a0980
Merge branch 'master' into navupdate
2012-03-01 14:55:22 +05:30
Nabin Hait
b95ad21208
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
2012-03-01 14:48:13 +05:30
Nabin Hait
cf907f98bd
error fixed in posting balance
2012-03-01 14:47:56 +05:30
Anand Doshi
552093c3fd
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
...
Conflicts:
version.num
2012-03-01 13:51:23 +05:30
Anand Doshi
1f4efc77ac
fix in print formats and file rename
2012-03-01 13:50:33 +05:30
Nabin Hait
eaf144a545
form cleanup in pur cycle
2012-03-01 13:05:04 +05:30
Nabin Hait
6d517ff005
form cleanup: fixed callback issues
2012-03-01 10:57:23 +05:30
Nabin Hait
63b275c97f
allowed debit and credit against same acc head
2012-03-01 10:35:35 +05:30
Nabin Hait
6c75cce4b9
fixed confilct
2012-02-28 11:46:43 +05:30
Anand Doshi
f9e4b16731
fix in scheduler related import issue
2012-02-28 11:31:46 +05:30
Nabin Hait
5bdd20c46b
dynamic label change, form cleanup, hide/unhide in purchase cycle
2012-02-27 18:46:51 +05:30
Nabin Hait
0959341130
Form Cleanup: Dynamic label change, smart hide/unhide and dependencies
2012-02-27 12:47:40 +05:30
Nabin Hait
0cde984dc5
Update future year balances at the time of tranaction and acc bal reposting patch
2012-02-27 12:34:14 +05:30
Rushabh Mehta
3966f1dc5d
added license files
2012-02-23 12:35:32 +05:30
Rushabh Mehta
c5471ddb8d
added setup and removed multi-col layout in body
2012-02-22 12:07:42 +05:30
Rushabh Mehta
35fabf76a6
updated module pages
2012-02-21 19:03:50 +05:30
Rushabh Mehta
d025133b39
added module pages and other css updates
2012-02-21 17:26:50 +05:30
Nabin Hait
6ac0be5fb2
delete all cancelled gl entry on account deletion
2012-02-20 13:04:36 +05:30
Nabin Hait
2d8ac7f3f9
fixed asynchronus issue
2012-02-15 17:31:23 +05:30
Nabin Hait
ab90ee04f5
callback issues and item default get most priority
2012-02-15 14:28:02 +05:30
Nabin Hait
84d73103f8
sales team mapping issue in SO-DN and SO-RV
2012-02-14 15:13:21 +05:30
Anand Doshi
ce0c65f173
Merge branch 'stable' into latest
2012-02-13 18:01:23 +05:30
Rushabh Mehta
f17ce7bc67
added whitelist check
2012-02-13 16:50:52 +05:30
Anand Doshi
702f174265
call update item details in post render
2012-02-13 15:29:41 +05:30
Anand Doshi
15d2d45b36
Merge branch 'stable' into latest
2012-02-10 10:57:26 +05:30
Anand Doshi
110047ea5b
Debit/Credit note creation on purchase/sales return
2012-02-10 10:48:35 +05:30
Anand Doshi
cf5f0232a9
Merge branch 'stable' into latest
2012-02-08 16:23:35 +05:30
Anand Doshi
df3f452a14
Fix in Purchase Invoice creation due to item tax stringify issue
2012-02-08 16:22:59 +05:30
Anand Doshi
9908d6e4be
Merge branch 'stable' into latest
2012-02-08 11:05:47 +05:30
Anand Doshi
c9fcc05792
Allow IS POS to be set as default from customize form view
2012-02-08 10:46:27 +05:30
Anand Doshi
4e47c48707
Merge branch 'stable' into latest
2012-02-07 13:33:10 +05:30
Anand Doshi
7e8082e193
Fixed mapping of conversion rate for PO-PR and PO-PV
2012-02-07 13:32:20 +05:30
Anand Doshi
67d2c8396c
Merge branch 'latest' of github.com:webnotes/erpnext into latest
...
Conflicts:
version.num
2012-02-07 10:59:29 +05:30
Anand Doshi
e00e70841c
Merge branch 'stable' into latest
...
Conflicts:
erpnext/accounts/doctype/journal_voucher/journal_voucher.js
erpnext/accounts/doctype/payable_voucher/payable_voucher.js
index.html
version.num
2012-02-07 10:58:45 +05:30
Anand Doshi
d008964fd6
Fetch defaults in purchase common and sales common related doctypes and fix minor utf-8 issues
2012-02-07 10:48:11 +05:30
Rushabh Mehta
e651648b1b
added missing icons
2012-02-06 16:28:06 +05:30
Anand Doshi
6d5cd01e03
Merge branch 'stable' into latest
2012-02-02 15:36:58 +05:30
Anand Doshi
2cb047d5a4
Added search field 'account_type' in account doctype
2012-02-02 15:36:34 +05:30
Anand Doshi
62427a6024
Merge branch 'stable' into latest
2012-02-02 15:23:33 +05:30
Anand Doshi
962c2aa80d
Auto fetch default bank account for jv of type Bank Voucher
2012-02-02 15:22:11 +05:30
Rushabh Mehta
bc5ec4f19e
version
2012-01-30 14:02:41 +05:30
Rushabh Mehta
d6840b202a
added products + cleanups
2012-01-30 14:00:46 +05:30
Anand Doshi
e72de12993
Merge branch 'master' into latest
...
Conflicts:
index.html
version.num
2012-01-30 11:59:05 +05:30
Anand Doshi
76a4caeada
fix in send notification part of recurring invoices
2012-01-27 14:34:26 +05:30
Anand Doshi
f5738817db
fix in recurring invoice
2012-01-27 14:18:09 +05:30
Anand Doshi
707cd06606
Merge branch 'latest' of github.com:webnotes/erpnext into latest
...
Conflicts:
erpnext/accounts/doctype/receivable_voucher/receivable_voucher.py
2012-01-27 12:30:35 +05:30
Anand Doshi
02c662936f
Merge branch 'master' into latest
2012-01-27 12:28:21 +05:30
Anand Doshi
74d1b65105
changed sql to webnotes.conn.sql to avoid errors due to closing of connections in scheduler/push patch
2012-01-27 12:25:09 +05:30
Rushabh Mehta
51e51da63f
added about_us
2012-01-27 12:17:09 +05:30
Rushabh Mehta
865c00a79a
started website
2012-01-24 14:33:21 +05:30
Anand Doshi
26814e7bad
Remove Get TDS button, which appears twice in JV
2012-01-19 14:26:25 +05:30
Anand Doshi
890aa0f51d
fix: interface error due to use of sql instead of webnotes.conn.sql
2012-01-18 12:25:20 +05:30
Anand Doshi
a318235a1f
Fix: Paid amount + Write Off Amount and grand total difference calculation with 2 decimal precision
2012-01-13 15:53:46 +05:30
Anand Doshi
266829f024
Merge branch 'master' into stable
2012-01-10 13:59:14 +05:30
Anand Doshi
a0aa3d5605
Merge branch 'master' of github.com:webnotes/erpnext
2012-01-10 13:59:04 +05:30
Anand Doshi
a9df960494
On Print Hide, hide net_total, rounded_total_export and grand_total_export
2012-01-09 16:55:30 +05:30
Anand Doshi
58455c9d8e
Changes in print format to hide taxes when using inclusive prices and showing reference rate when discount is to be displayed
2012-01-06 14:33:57 +05:30
Anand Doshi
5e57a39bb1
Merge branch 'master' into stable
2012-01-04 19:32:01 +05:30
Anand Doshi
f80f20f480
Changes in Notifications
2012-01-04 19:31:32 +05:30
Anand Doshi
6ac1d4bb44
Merge branch 'stable' of github.com:webnotes/erpnext into stable
...
Conflicts:
erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt
2012-01-03 11:45:11 +05:30
Anand Doshi
d56d57d205
Patch system changes, Inclusive Price feature and session cache clear on disabling user or on new login
2012-01-02 16:25:05 +05:30
Anand Doshi
10748d6bdb
Merge pull request #190 from anandpdoshi/master
...
Changed link for customer master and supplier master in accounts browser
2011-12-28 03:49:13 -08:00
Anand Doshi
eaa6d21691
Changed link for customer master and supplier master in accounts browser
2011-12-28 17:18:09 +05:30
Nabin Hait
9e08c12a10
Default price list currency issue in delivery note fixed
2011-12-28 16:30:48 +05:30
Nabin Hait
3029474b0e
Fixes in recurring invoice
2011-12-27 16:42:03 +05:30
Nabin Hait
382dc6e819
GL Mapper changes for JV
2011-12-23 18:25:11 +05:30
Nabin Hait
d0a892ffe7
print hide price list flds
2011-12-22 19:04:49 +05:30
Nijil Y
9e6f00abab
fixes for notification
2011-12-21 14:54:14 +05:30
Nabin Hait
60fc54a9ba
Price List redesign: Maintain PL in any currency and convert it into base currency in the particular form
2011-12-20 18:59:26 +05:30
Nabin Hait
b2150de64b
Freezing Error fixed in purchase invoice
2011-12-15 16:29:04 +05:30
Nabin Hait
9e4d5b9649
Merge branch 'master' of github.com:webnotes/erpnext
2011-12-14 11:27:50 +05:30
Nabin Hait
f21ceb283c
Arranged field order in item table
2011-12-14 11:26:05 +05:30
Nabin Hait
dcac0e7565
Merge pull request #156 from anandpdoshi/master
...
Email Digest and patch to remove duplicate entries created in Table Mapper Detail
2011-12-13 05:37:41 -08:00
Nabin Hait
08d803791d
Merge branch 'master' of git://github.com/nijil/erpnext
2011-12-13 18:49:59 +05:30
Nabin Hait
85e8e01fd6
notification email for recurring invoice
2011-12-13 18:48:24 +05:30
Nijil Y
8fb260504a
purchase discount
2011-12-13 18:14:15 +05:30
Anand Doshi
206df20f36
Changes in print formats to include selected print heading and discount
...
appended in description
2011-12-13 15:57:09 +05:30
Anand Doshi
5245e6547b
Change path of images in accounts browser and sales browser
2011-12-12 19:18:23 +05:30
Nabin Hait
8a6b3b8713
Validation added in c-form
2011-12-12 14:16:16 +05:30
Nijil Y
fdc7fc62a5
payable voucher.js
2011-12-12 10:50:18 +05:30
Nijil Y
b54d7282a7
pvdetail
2011-12-12 10:31:23 +05:30
Nijil Y
38821f6104
txt order update
2011-12-08 18:32:58 +05:30
Nabin Hait
fd20340576
Introduced C-form for Indian customer
2011-12-08 17:49:40 +05:30
Nijil Y
edf8bc2a3e
Discount in purchase cycle Merge branch 'master' of git://github.com/nijil/erpnext
...
Conflicts:
erpnext/accounts/doctype/pv_detail/pv_detail.txt
erpnext/buying/doctype/po_detail/po_detail.txt
erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt
2011-12-08 17:29:24 +05:30
Nijil Y
add0c85648
Discount in purchase cycle
2011-12-08 16:53:12 +05:30
Nijil Y
d8e5bed9e5
Discount in purchase cycle
2011-12-08 16:09:18 +05:30
Nabin Hait
38d24534d7
Recurring invoice checkbox added in features setup
2011-12-06 19:04:21 +05:30
Nabin Hait
a4fdc84fda
Introduced recurring invoices
2011-12-06 15:04:47 +05:30
Nijil
2f82c29348
..
2011-11-24 15:18:17 +05:30
Nijil
ba40bc93fe
payable voucher txt
2011-11-24 15:14:09 +05:30
Nijil
c37dad26d9
txt files
2011-11-24 15:07:54 +05:30
Nabin Hait
e92066fa80
modified fld prop in gl entry and index patch
2011-11-24 15:04:47 +05:30
Anand Doshi
956d665738
Merge pull request #148 from anandpdoshi/master
...
Modified GLEntry doctype to be not in create
2011-11-24 00:29:53 -08:00
Anand Doshi
96e5343519
Marked GLEntry as Not In Create
2011-11-24 13:51:09 +05:30
Nabin Hait
04176e62d8
fixed error in internal reco
2011-11-23 12:15:42 +05:30
Nijil
54eb735a47
Added Discount in Purchase Cycle
2011-11-22 15:12:00 +05:30
Nabin Hait
f164b269db
Merge branch 'master' of github.com:webnotes/erpnext
2011-11-16 16:39:16 +05:30
Nabin Hait
b0fa2af45b
Rewritten landed cost wizard
2011-11-16 16:20:37 +05:30
Anand Doshi
bf41aef7f0
Merge pull request #144 from anandpdoshi/master
...
Changes in spartan print formats to show border in chrome
2011-11-16 01:20:33 -08:00
Anand Doshi
19a2767b77
Changes in spartan print formats to show border in chrome
2011-11-16 14:49:37 +05:30
Anand Doshi
0900756510
Merge pull request #143 from anandpdoshi/master
...
Changes in Sales Invoice Print Formats
2011-11-16 00:34:36 -08:00
Anand Doshi
9fe4331862
Changes in Sales Invoice Print Format
2011-11-16 14:03:52 +05:30
Anand Doshi
ded71563c8
Merge pull request #142 from anandpdoshi/master
...
New Print Formats as part of erpnext repository
2011-11-16 00:02:43 -08:00
Anand Doshi
e3559853bd
Added new Print Formats as part of repository
2011-11-16 13:18:45 +05:30
Nabin Hait
0c92493c81
Fixed check_for_acc_of_supplier validation
2011-11-16 10:12:32 +05:30
Nabin Hait
5b7badaf20
supplier account head validated with supplier
2011-11-11 12:37:53 +05:30
Nabin Hait
cc02fd445c
Repair button only visible after submit
2011-11-07 12:14:28 +05:30
Nabin Hait
612efe843b
POS Setting js code restored from history
2011-10-21 16:19:58 +05:30
Nabin Hait
57dd62d790
project column moved to item table in pur cycle
2011-10-20 19:19:07 +05:30
Nabin Hait
69554511da
fixes in patch
2011-10-19 16:35:39 +05:30
Nabin Hait
7762bdaf77
Letter head issue fixed in print format
2011-10-19 15:05:26 +05:30
Nabin Hait
1a1ce709e0
Changes regarding POS fields
2011-10-13 14:08:33 +05:30
Nabin Hait
ee9efb568b
flds added in mapper
2011-10-12 12:42:07 +05:30
Nabin Hait
685564f71d
Resolved conflict after merging with master
2011-10-11 14:42:34 +05:30
Nabin Hait
fb37157163
packing slip related changes and test case for item
2011-10-11 13:57:48 +05:30
Nabin Hait
2810691979
field hide/unhide for pos
2011-10-10 12:33:43 +05:30
Nabin Hait
6a0561612f
cost center groupto ledger and vice versa
2011-10-10 12:23:10 +05:30
Nabin Hait
1971942db8
purchase tax mapping while pulling
2011-10-05 14:56:16 +05:30
Nabin Hait
c8d5625763
removed trashed profile from user search result
2011-09-27 15:26:29 +05:30
Nabin Hait
d9a16a282c
deleted gl_entry.js file
2011-09-27 15:10:07 +05:30
Nabin Hait
ec451da2f4
Re-written update_against_document_in_jv function in RV and PV
2011-09-27 12:47:59 +05:30
Nabin Hait
e2df68bb5b
reload internal reconciliation
2011-09-27 12:47:09 +05:30
Nabin Hait
80ed6b25e8
deleted gl_control.js file
2011-09-27 11:53:23 +05:30
Nabin Hait
3c8a50c257
Trial balance opening issue fixed if there is no prev year
2011-09-27 11:16:30 +05:30
Nabin Hait
a77cea2b90
Dont add opening entries in account balance debit, credit column
2011-09-27 11:14:54 +05:30
Nabin Hait
c752d075e6
fixed issue in reseting in opening balance, clear bal only that company
2011-09-27 11:04:24 +05:30
Nabin Hait
c034e3d531
Merge branch 'master' of github.com:webnotes/erpnext
2011-09-27 10:55:24 +05:30
Nabin Hait
39297e5775
update_nsm_model in cost center on_trash()
2011-09-27 10:36:17 +05:30
Nabin Hait
d223d12308
Rewritten update_against_document function
2011-09-26 18:57:43 +05:30
Nabin Hait
5f2046496b
Internal Reconciliation: for knock out booking and payment entries
2011-09-26 18:56:02 +05:30
Nabin Hait
2736fd59ca
fixed cancelled gl entry issue in period closing voucher
2011-09-26 12:55:52 +05:30
Nabin Hait
f060d0cd16
contact address will be fetched in sales invoice onload when come through mapper
2011-09-16 17:28:49 +05:30
Rushabh Mehta
2adbd89ada
Merge branch 'master' of github.com:webnotes/erpnext
2011-09-15 15:09:14 +05:30
Rushabh Mehta
53ba83158c
fixes to startup
2011-09-15 15:06:23 +05:30
Nabin Hait
3b19f6b7c8
opening balance fixes in general ledger
2011-09-15 14:38:54 +05:30
Rushabh Mehta
0aed26d83d
moved report to folder
2011-09-15 13:00:46 +05:30
Rushabh Mehta
2773940db1
merged from master
2011-09-15 12:55:25 +05:30
Rushabh Mehta
1e11cb486d
merging from master and usability fixes to setup
2011-09-14 13:25:10 +05:30
Rushabh Mehta
5f50617121
removed readme
2011-09-13 15:48:51 +05:30
Rushabh Mehta
8cf45175a7
Merge branch 'master' of github.com:webnotes/erpnext
2011-09-08 14:17:41 +05:30
Rushabh Mehta
aa7b05aaeb
Merge branch 'master' of github.com:webnotes/erpnext
2011-09-06 12:47:51 +05:30
Rushabh Mehta
66ac2b018a
first cut for lazy loading framework
2011-09-05 18:43:09 +05:30