Anand Doshi
02edae8fac
Added hook: setup_wizard_exception
2014-05-12 12:37:32 +05:30
Nabin Hait
bbfe2517ea
BOM validation message fixed
2014-05-11 18:27:07 +05:30
Nabin Hait
2f50b85f99
Test case fixes for serial no
2014-05-11 13:03:53 +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
75e50ee082
Fixes for subcontracting
2014-05-11 12:11:15 +05:30
Nabin Hait
6d5c248402
Test case fixes for serial no
2014-05-11 12:10:57 +05:30
Nabin Hait
5365108ef9
Test case fixes for pos setting
2014-05-11 12:10:17 +05:30
Nabin Hait
7e373010d7
Test case fixes in time log batch
2014-05-11 12:08:39 +05:30
Rushabh Mehta
409c8e9732
removed confirmation date validations (wtf)
2014-05-11 10:01:16 +05:30
Rushabh Mehta
75e11a7270
Merge pull request #1616 from pdvyas/migrate-3to4
...
3 to 4 migration fixes
2014-05-10 22:19:07 +05:30
Pratik Vyas
6e686224eb
fix patches
2014-05-10 22:17:04 +05:30
Pratik Vyas
95f558e7bc
fix update user properties patch
2014-05-10 22:16:39 +05:30
Rushabh Mehta
2667a50334
clear cache before running setup wizard
2014-05-09 19:20:31 +05:30
Rushabh Mehta
9591b8ec93
Merge pull request #1613 from anandpdoshi/deprecate-link-selects
...
Deprecate Select fields with options as link:
2014-05-09 14:09:51 +05:30
Anand Doshi
78e9c6ef70
Deprecate Select fields with options as link:
2014-05-09 13:36:13 +05:30
Nabin Hait
a5ac0149af
Merge pull request #1612 from pdvyas/migrate-3to4
...
3 to 4 migration
2014-05-09 12:07:11 +05:30
Pratik Vyas
34e36a233c
Patch changes for 3 to 4 migration
2014-05-09 12:01:25 +05:30
Nabin Hait
d64a952b5d
Stock reco: item and warehouse validation and translation fixes
2014-05-09 11:50:24 +05:30
Nabin Hait
966edff222
minor fix
2014-05-09 10:54:12 +05:30
Nabin Hait
344f4436f1
Create / update raw materials supplied table for sub-contracting
2014-05-08 19:08:20 +05:30
Nabin Hait
5d070753fd
Item managed batch-wise, can not be reconciled through stock reconciliation
2014-05-08 19:08:06 +05:30
Nabin Hait
844dd36ff9
PP tool: get items from SO based on item filter
2014-05-08 19:07:34 +05:30
Nabin Hait
3c5bc544ea
Serial no and batch no field added in purchase receipt item supplied table
2014-05-08 19:07:02 +05:30
Nabin Hait
227db769a0
Item valuation rate on material transfer based on fifo
2014-05-08 19:06:01 +05:30
Anand Doshi
0c85169539
Fixed clear cache for item page
2014-05-08 17:46:00 +05:30
Anand Doshi
3415cdb208
Merge pull request #1604 from anandpdoshi/bugfix-v4
...
Newsletter status display. Fixes #1593
2014-05-08 12:09:29 +05:30
Anand Doshi
08ef467fc6
Fixed moduleview language issue
2014-05-08 11:43:18 +05:30
Nabin Hait
e37b8e6682
fixed conflict
2014-05-07 19:20:56 +05:30
Nabin Hait
23649c6852
fixe in query.py
2014-05-07 19:18:15 +05:30
Anand Doshi
7e1b75a705
Newsletter status display. Fixes #1593
2014-05-07 18:44:02 +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
Nabin Hait
706eb7f2c7
fixed conflict
2014-05-07 15:13:52 +05:30
Nabin Hait
90f2d8d9fc
minor fix
2014-05-07 14:55:09 +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
4b438eee6d
Revert "Autocreate naming series options based on Fiscal Year"
...
This reverts commit 8a6febbaa5
2014-05-07 10:58:39 +05:30
Anand Doshi
8a6febbaa5
Autocreate naming series options based on Fiscal Year
2014-05-06 19:44:22 +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
3fcec56f7b
Bulk rename tool fixes #1594
2014-05-06 19:13:46 +05:30
Nabin Hait
a521343063
Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix
2014-05-06 18:53:02 +05:30
Nabin Hait
ce4a87ce83
Maintenance schedule: get no of visits and period validation. Fixes #1591
2014-05-06 18:52:36 +05:30
Anand Doshi
7fc9b63dc7
Merge pull request #1590 from anandpdoshi/remove-india-specific-fields
...
Remove India specific fields
2014-05-06 16:48:18 +05:30
Nabin Hait
50e962b279
Special characters allowed in company name. Fixes #1259
2014-05-06 16:46:32 +05:30
Anand Doshi
4b7a6b13ec
Additions to remove India specific fields
2014-05-06 16:41:31 +05:30
Nabin Hait
3190f99ebe
Option for selecting already reconciled entries in bank reconciliation #1310
2014-05-06 16:39:24 +05:30
Anand Doshi
37909b292f
Remove India specific fields
2014-05-06 16:15:56 +05:30
Nabin Hait
5c82014ba9
Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix
2014-05-06 14:01:30 +05:30
Nabin Hait
c82e967e97
Cannada translation
2014-05-06 14:01:04 +05:30
Nabin Hait
b63384b3d4
Merge pull request #1588 from nabinhait/v4-hotfix
...
Allow Rename option added in multiple docs. Fixes #1521
2014-05-06 12:34:50 +05:30
Nabin Hait
02d37bbb5a
Allow Rename option added in multiple docs. Fixes #1521
2014-05-06 12:18:50 +05:30
Anand Doshi
728be8c4d4
Merge pull request #1587 from anandpdoshi/bugfix-v4
...
Enable frequently used currencies. Fixes #1561
2014-05-06 12:18:37 +05:30
Anand Doshi
de560aa094
Enable frequently used currencies. Fixes #1561
2014-05-06 12:02:23 +05:30
Nabin Hait
b1285f9fce
Time Log Batch creation from time log list
2014-05-06 11:58:00 +05:30
Nabin Hait
cea4cd4e5f
Pull stock entry difference account from company
2014-05-06 11:57:33 +05:30
Pratik Vyas
4d911db902
Release 4.0.0
2014-05-05 19:14:45 +05:30
Nabin Hait
b99a3517c3
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-05-05 18:42:07 +05:30
Nabin Hait
98c2a052e5
Fixes in pricing rule testcases #565
2014-05-05 18:41:41 +05:30
Nabin Hait
ac1bc212ea
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-05-05 18:27:31 +05:30
Anand Doshi
91b451b8ce
Updated validate v3 patch
2014-05-05 18:25:37 +05:30
Anand Doshi
648062d071
Fixes in test cases
2014-05-05 16:46:38 +05:30
Nabin Hait
f2db87a766
Pricing Rule: If rule for price applied, discount rule against price list should not be applied #565
2014-05-05 15:04:55 +05:30
Nabin Hait
53dab55703
Pricing Rule: if multiple rules, ask to resolve conflict #565
2014-05-05 14:49:40 +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
Nabin Hait
d5886f36af
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-05-05 10:28:20 +05:30
Nabin Hait
f57f0a661a
Stock Entry: pulling items from BOM fixed #1579
2014-05-05 10:27:53 +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
6dad4e9e89
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-05-04 16:02:44 +05:30
Nabin Hait
a096b2004f
Financial analytics graph fix #1542
2014-05-04 16:02:26 +05:30
Anand Doshi
4ab5382d3f
Item Group delete permission, Serial No status and item code should be non-editable. Fixes #1564
2014-05-04 11:50:10 +05:30
Rushabh Mehta
24a3ec57e3
update to tests
2014-05-03 16:22:46 +05:30
Anand Doshi
75042fd502
Show Activity entries based on permissions. Completely fixes #1481
2014-05-02 19:44:28 +05:30
Anand Doshi
2b0e4266cf
Go to home page on clicking left arrow in note list
2014-05-02 19:43:11 +05:30
Anand Doshi
ef5407479a
Show Chart of Accounts in Accounts > Documents. Fixes #1559
2014-05-02 19:42:27 +05:30
Anand Doshi
56f29cbb27
Fixed contact page response. Fixes #1557
2014-05-02 18:17:39 +05:30
Nabin Hait
232954d4b9
Fixed updating cost on BOM after submission #1563
2014-05-02 17:51:24 +05:30
Nabin Hait
053a87edf6
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-05-02 17:37:38 +05:30
Nabin Hait
296d626e53
Back flush issue fixed in sub contracting #1567
2014-05-02 17:36:13 +05:30
Nabin Hait
bc83b9c1ac
minor fix
2014-05-02 17:03:18 +05:30
Anand Doshi
b71a18cd1e
Leave Allocation Tool and Employee. Fixes #1555
2014-05-02 16:23:51 +05:30
Nabin Hait
2cebf9b499
minor fix #1565
2014-05-02 16:12:07 +05:30
Nabin Hait
ef30932807
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-05-02 15:45:52 +05:30
Nabin Hait
6b03914731
asynchronus issue in get_party_details
2014-05-02 15:45:10 +05:30
Anand Doshi
f29bcaf436
Added new fixtures ( Fixes #1540 ). Removed Employee Grade from HR.
2014-05-02 13:55:07 +05:30
Rushabh Mehta
4ceb20e07f
hooks.txt -> hooks.py
2014-05-02 12:15:11 +05:30
Nabin Hait
1e6c32e95f
Address and contact creation from opportunity #1570
2014-05-02 11:42:24 +05:30
Nabin Hait
92c4fc4e19
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-05-02 10:27:17 +05:30
Nabin Hait
d341254786
Purchase receipt to purchase invoice item
2014-05-01 17:42:21 +05:30
Anand Doshi
51e6d2228d
Salary Slip - read permission for Employee. Fixes #1553
2014-05-01 16:28:13 +05:30
Nabin Hait
292a254bc1
payment to invoice matching tool disabled temporarily
2014-05-01 15:46:37 +05:30
Nabin Hait
5b98340d15
payment to invoice matching
2014-05-01 15:43:22 +05:30
Nabin Hait
e5bd955f4d
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-05-01 09:56:14 +05:30
Anand Doshi
d9f0f27cd4
Fixes in test cases
2014-04-30 22:16:25 +05:30
Nabin Hait
dcfad4f645
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-04-30 20:32:07 +05:30
Nabin Hait
613919325d
Fixes in link field queries
2014-04-30 20:30:33 +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
a47bf2ab66
Removed check for duplicate in sales bom, set default income account in Company
2014-04-30 18:54:05 +05:30
Anand Doshi
f62da519d6
Sales BOM Parent Item search - Fixes #1544
2014-04-30 16:50:39 +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
33003c6168
fix for feature setup in install.py
2014-04-30 11:16:02 +05:30
Rushabh Mehta
104c9f465d
updated translations
2014-04-29 18:36:27 +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
Nabin Hait
b1777ecfd8
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-04-29 11:31:37 +05:30
Nabin Hait
17910aa0d6
Removed income and expense related info temporarily from email digest
2014-04-29 11:31:11 +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
Anand Doshi
69aa8ffac4
Fixed as_dict of employee.py
2014-04-28 16:51:34 +05:30
Nabin Hait
2594e41462
Removed Stock Ledger doctype
2014-04-28 16:23:45 +05:30
Nabin Hait
48962e1148
Minor fix in sales funnel report
2014-04-28 15:43:32 +05:30
Anand Doshi
65f83cbae7
BugFix: Sales Order with Order Type as Shopping Cart
2014-04-28 15:33:34 +05:30
Anand Doshi
3b3d55cda2
Usability: Set For Warehouse and Work-in-Progress Warehouse as mandatory, when the user clicks Submit
2014-04-28 15:33:34 +05:30
Anand Doshi
4c90bae16d
BugFix: Item search in Production Planning Tool
2014-04-28 15:33:34 +05:30
Anand Doshi
6916baa299
BugFix: Item search in Stock UOM Replace Utility
2014-04-28 15:33:34 +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
Rushabh Mehta
41d126586e
fix get_server_fields in stock_entry.js
2014-04-27 12:30:20 +05:30
Anand Doshi
8e5b2af0fb
Set conversion_factor in stock entry test case
2014-04-25 19:35:06 +05:30
Anand Doshi
fc79efb97c
Fixes #1532 . Only show an error message for missing Quality Inspection but let the user submit Purchase Receipt.
2014-04-25 18:44:28 +05:30
Anand Doshi
1872312cc6
Deprecated client side mapper: frappe.model.map. Fixes #1530
2014-04-25 18:38:08 +05:30
Anand Doshi
e3f6b6d899
Fixed Opportunity Lost UX
2014-04-25 18:36:06 +05:30
Anand Doshi
69a2c25ca5
Fixed set_query
2014-04-25 18:35:45 +05:30
Anand Doshi
bbffaf78fb
BugFix: use transfer_qty instead of actual_qty in check_duplicate_entry_for_production_order - ported webnotes/erpnext@942ff2583b
2014-04-25 18:31:09 +05:30
Anand Doshi
8bde7f9b3a
Conditionally toggle Naming Series. Fixes #1526
2014-04-24 18:11:49 +05:30
Anand Doshi
7f2d08b03f
Fixed Naming Series page loading fails #1524
2014-04-24 13:51:35 +05:30
Anand Doshi
8c62c40a3d
Fixed Make Sales Order from Quotation #1522
2014-04-24 12:40:19 +05:30
Anand Doshi
78eeacb53c
Fixes in Lead, Opportunity, Quotation, Setup Wizard
2014-04-23 19:15:15 +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
4bb87373dc
Fixed default website creation
...
Default website generation was creating company page twice,
which led to duplicate website route validation
2014-04-22 19:50:08 +05:30
Anand Doshi
68d0b7c7ff
get_item_details fixed for Material Request
2014-04-22 19:30:53 +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
Rushabh Mehta
4ef1835bee
website updates
2014-04-22 16:52:35 +05:30
Anand Doshi
2944f49974
Setup Wizard: on country select, change date format, save logo in Website Settings > Brand HTML
2014-04-22 16:25:58 +05:30
Anand Doshi
07339fc69e
Fixes in Setup Wizard and Attachments
2014-04-22 15:30:24 +05:30
Rushabh Mehta
3f51705ba4
website cleanups
2014-04-21 22:10:43 +05:30
Anand Doshi
0549b1c5c9
Duplicate supplier delivery number validation in Purchase Receipt should happen per financial year
2014-04-21 15:59:47 +05:30
Anand Doshi
21ae930b4c
Removed controller.py
2014-04-21 15:12:50 +05:30
Anand Doshi
424c033395
Removed controller.py
2014-04-21 15:06:56 +05:30
Rushabh Mehta
40b2b03bcb
demo fixes
2014-04-21 13:43:35 +05:30
Rushabh Mehta
f63513ed38
minor fixes to website
2014-04-21 13:43:35 +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
5d591ebe83
Item, Item Group and Partner Web Page generators moved from Shopping Cart to ERPNext
2014-04-18 16:20:07 +05:30
Rushabh Mehta
603e6e21b5
test fixes
2014-04-18 16:17:29 +05:30
Rushabh Mehta
370a024e46
cleaned up sample website and separated fixtures by country
2014-04-18 16:00:41 +05:30
Rushabh Mehta
169c1fd93b
fixed translation for setup-wizard and removed purchase validation for Material Request #925
2014-04-18 10:40:17 +05:30
Anand Doshi
ac32bad25a
Fixes in Taxes, Quotation and Address Territory
2014-04-18 01:32:02 +05:30
Rushabh Mehta
52e618d0b2
updates to Setup Wizard, set language as first input
2014-04-17 18:50:33 +05:30
Anand Doshi
dbfcd328fb
Fixes update_after_submit validation errors
2014-04-17 12:35:04 +05:30
Anand Doshi
0d345c9152
Fixes Item Price duplicate entry validation
2014-04-17 11:40:22 +05:30
Anand Doshi
de1a97d506
Fixes get_voucher_detail for Stock Reconcilation
2014-04-17 11:37:46 +05:30
Anand Doshi
094610d7ce
Fixes in Production, Stock Entry and Stock Controller
2014-04-16 20:23:24 +05:30
Rushabh Mehta
eea802298e
refactor get_voucher_details in stock_controller
2014-04-16 19:38:40 +05:30
Rushabh Mehta
052fe82688
production order: test fixed and added in test_stock_entry.py
2014-04-16 19:20:11 +05:30
Rushabh Mehta
166bc2a0e0
translations: updated German
2014-04-16 18:37:57 +05:30
Rushabh Mehta
c38fc713c6
updated translations
2014-04-16 17:46:30 +05:30
Rushabh Mehta
8c51318d82
added naming series for campaign #1413
2014-04-16 17:41:52 +05:30
Rushabh Mehta
e8b0402a10
added naming series for campaign #1413
2014-04-16 17:41:52 +05:30
Rushabh Mehta
c635875765
added naming series for campaign #1413
2014-04-16 17:41:51 +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
13429a3b34
Space allowed in naming series
...
Conflicts:
setup/doctype/naming_series/naming_series.py
2014-04-16 15:24:04 +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
Nabin Hait
450d9d72d7
Minor fix in monthly attendance report
...
Cherry-picked and modified by @anandpdoshi
Conflicts:
hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py
2014-04-16 15:23:09 +05:30
Nabin Hait
6298536e46
set stock balance as per serial no count
...
Cherry Picked and Modified by @anandpdoshi
Conflicts:
stock/doctype/stock_ledger/stock_ledger.py
utilities/repost_stock.py
2014-04-16 15:23:08 +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
1d8f1a9a46
#1481
2014-04-16 09:32:51 +05:30
Rushabh Mehta
82d8a637ac
#1252
2014-04-16 09:20:00 +05:30
Rushabh Mehta
d85dc868ca
more message fixes for translation
2014-04-15 22:54:34 +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
Anand Doshi
c5e057f676
Fixed exploded BOM construction
2014-04-15 16:14:15 +05:30
Rushabh Mehta
2c45899a02
fixed strings for translation
2014-04-15 14:41:56 +05:30
Anand Doshi
5d4ffa6cf8
Fixed splash.svg
2014-04-15 13:09:09 +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
e1eeb22f1e
remove linebreaks for translation strings (js)
2014-04-15 10:50:36 +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
354b32177d
fix for leave application test
2014-04-14 22:23:41 +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
Pratik Vyas
f7daab7393
pass only valid columns to get_item_details
2014-04-10 17:53:30 +05:30
Anand Doshi
233fbb08b2
Minor fix
2014-04-10 12:53:16 +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
Nabin Hait
103cc58cb6
material request testcase #478
2014-04-07 16:40:43 +05:30
Nabin Hait
4155e58a61
Merge branch 'model-cleanup' of github.com:frappe/erpnext into model-cleanup
2014-04-07 16:00:49 +05:30
Nabin Hait
088dec6c09
testcase fixes #478
2014-04-07 16:00:28 +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
9f66c306ea
Merge branch 'model-cleanup' of github.com:frappe/erpnext into model-cleanup
2014-04-07 12:01:59 +05:30
Anand Doshi
bedc62f090
Fixed Feed
2014-04-04 16:26:45 +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
Rushabh Mehta
c10213d861
Merge branch 'model-cleanup' of github.com:frappe/erpnext into model-cleanup
2014-04-03 17:43:28 +05:30
Rushabh Mehta
0cf531c8a6
frappe/frappe#478 fixes
2014-04-03 17:43:06 +05:30
Nabin Hait
c272f2020b
Merge branch 'model-cleanup' of github.com:frappe/erpnext into model-cleanup
2014-04-03 17:39:50 +05:30
Nabin Hait
365ae27acf
frappe/frappe#478 fixes
2014-04-03 17:38:54 +05:30
Rushabh Mehta
7db7112d3f
frappe/frappe#478 fix and added print heading
2014-04-03 15:04:18 +05:30
Rushabh Mehta
99f914b782
frappe/frappe#478 , fixes
2014-04-03 14:47:03 +05:30
Rushabh Mehta
2fbb00fd8d
frappe/frappe#478 , more changes, removed bean
2014-04-03 14:38:22 +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
cfb6ccfe51
frappe/frappe#478 removed self.doclist
2014-04-03 11:46:52 +05:30
Rushabh Mehta
f191f854cd
frappe/frappe#478 erpnext install works
2014-04-02 18:09:34 +05:30
Anand Doshi
943e614810
frappe/frappe#478
2014-04-02 16:37:35 +05:30
Anand Doshi
63dfe3d3b3
Merge branch 'model-cleanup' of github.com:frappe/erpnext into model-cleanup
2014-04-02 15:03:51 +05:30
Anand Doshi
5b552b51f1
frappe/frappe#478
2014-04-02 15:03:35 +05:30
Rushabh Mehta
732825cb23
frappe/frappe#478 fixed todo and renamed hooks
2014-04-02 12:08:03 +05:30
Anand Doshi
dd32d6eb1f
frappe/frappe#478
2014-04-01 12:22:14 +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
43405203b2
frappe/frappe#478
2014-03-28 16:43:50 +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
Nabin Hait
5c6b34a84c
minor fix
2014-03-26 10:30:25 +05:30
Nabin Hait
3a70ba3ba1
Merge github.com:frappe/erpnext into develop
2014-03-26 10:23:53 +05:30
Nabin Hait
d6e4ab3fd4
maintenance schedule: validate amc dates and update in serial no
2014-03-26 10:23:27 +05:30
Nabin Hait
1d630ccaa5
Update serial no maintenance status based on warranty/amc expiry date
2014-03-26 10:23:14 +05:30
Anand Doshi
754cbd4036
Fixed Permissions and Time Log
2014-03-25 20:09:12 +05:30
Nabin Hait
6fa0f25e7c
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-03-25 19:36:16 +05:30
Nabin Hait
0c9d42258c
Minor fix related to pos paid amount
2014-03-25 19:35:41 +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
ec9fb67d84
fixed conflict
2014-03-25 16:53:50 +05:30
Anand Doshi
7fbdba02ab
Fixed Countrywise Chart of Accounts patch
2014-03-25 13:50:52 +05:30
Nabin Hait
221a8fff1c
minor fix in patch
2014-03-23 17:35:24 +05:30
Nabin Hait
96c0afe0f1
minor fix in patch
2014-03-23 17:25:02 +05:30
Nabin Hait
06a595090d
coa: minor fix
2014-03-21 18:30:46 +05:30
Nabin Hait
425bfc5c8d
minor fix in serial no
2014-03-21 18:15:26 +05:30
Nabin Hait
155c96b410
patch to delete mis control and financial statements and set bank/cash account
2014-03-21 12:15:13 +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
47a3c10334
Patch to update old accounts property
2014-03-21 11:26:08 +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
102842ba79
Leave allocation fix
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
482ffac83f
Set paid amount to zero if not pos
2014-03-21 11:26:07 +05:30
Nabin Hait
439dceebd8
minor fix in landed cost wizard
2014-03-21 11:25:17 +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
24e136e3f3
Patch: set root_type for old existing accounts
2014-03-21 11:25:16 +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
d7d9d25d71
Country and chart fields added in company master
2014-03-21 11:22:40 +05:30
Nabin Hait
813a93d78d
import chart records into database frm json
2014-03-21 11:22:40 +05:30
Nabin Hait
a69c30edec
country code added
2014-03-21 11:22:39 +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
eb7fea673b
Fixed set_single_defaults during install
2014-03-19 17:10:01 +05:30
Anand Doshi
4b2692182a
Fixes after change in fields handling in Document
2014-03-19 16:58:42 +05:30
Anand Doshi
76f330ca66
Fixed Fiscal Year input issue in Setup Wizard
2014-03-19 15:45:05 +05:30
Anand Doshi
2134d24b36
Removed cloud subscription logic
2014-03-14 15:24:57 +05:30
Anand Doshi
49e0a687b3
Minor Fixes
2014-03-13 20:44:28 +05:30
Nabin Hait
54106807e4
Set paid amount to zero if not pos
2014-03-13 17:26:41 +05:30
Nabin Hait
a8dbb0dd41
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-03-13 17:23:24 +05:30
Pratik Vyas
65e8676f8b
Profile -> User
2014-03-13 03:09:15 +05:30
Pratik Vyas
5c81f9c44e
check docstatus before updating employee
2014-03-13 02:35:23 +05:30
Rushabh Mehta
7c932003ed
rename Profile to User frappe/frappe#470
2014-03-11 16:15:59 +05:30
Anand Doshi
c379c78fec
Fixed Dropbox, Scheduler, 3to4 migration
2014-03-11 15:17:13 +05:30
Anand Doshi
09a9f4c0c9
Added module to Report doctype
2014-03-07 17:20:22 +05:30
Rushabh Mehta
c12ccdb6ea
bugfix erpnext/frappe#1446
2014-03-06 15:45:45 +05:30
