Rushabh Mehta
bc92824bc4
[minor] rename item_name if same as item, on rename and removed item selector
2016-05-31 07:22:51 +05:30
Nabin Hait
37b5e0c99f
Merge pull request #5399 from nabinhait/report-graph
...
Charts on reports / activity page, deprecated financial analytics report
2016-05-26 17:42:36 +05:30
Anand Doshi
ac7c81bb98
[fix] compiled erpnext.less to erpnext.css
2016-05-26 16:41:04 +05:30
Nabin Hait
b46d021f2a
Charts on reports / activity page, deprecated financial analytics report
2016-05-26 15:26:01 +05:30
Nabin Hait
44c1b8e63b
Line/Bar chart in Balance Sheet / Profit and Loss statement
2016-05-26 15:26:01 +05:30
Rohit Waghchaure
f2aa1764cc
[POS] enhancement and minor fixes
2016-05-25 15:04:46 +05:30
Rushabh Mehta
ac123c57f3
[cleanup] website / portal css
2016-05-20 16:37:14 +05:30
Nabin Hait
3956c94bbb
Merge pull request #5340 from rohitwaghchaure/support_week_new
...
[Fix] Sales Invoice shows default date while no default mentioned
2016-05-20 12:06:22 +05:30
Anand Doshi
1d88c6a742
[fix] [patch] home page + erpnext.css
2016-05-20 10:42:04 +05:30
Rohit Waghchaure
5d97d89a03
[Fix] Sales Invoice shows default date while no default mentioned
2016-05-17 15:13:17 +05:30
Rohit Waghchaure
e0934d118f
[Fixes] Some changes and fixes
2016-05-16 12:01:16 +05:30
Rushabh Mehta
4b9238a03b
[cleanup] homepage
2016-05-12 15:23:17 +05:30
Rushabh Mehta
d42167e0e5
[cleanup] remove Features Setup
2016-05-11 16:47:14 +05:30
Rushabh Mehta
2dd0581134
[added] domainify.py
2016-05-11 15:14:15 +05:30
Anand Doshi
a3f20ae9e6
Merge pull request #5329 from KanchanChauhan/shoppingcart-cleanup
...
Shopping Cart error messages issue resolved
2016-05-10 17:35:02 +05:30
Kanchan Chauhan
1d79f350bc
Shopping Cart error messages issue resolved
2016-05-10 17:19:47 +05:30
Rohit Waghchaure
6087fe178e
[Enhancement] POS
2016-05-09 23:36:15 +05:30
Anand Doshi
969863541d
Merge pull request #5323 from KanchanChauhan/shoppingcart-changes
...
Shopping cart dropdown changes
2016-05-09 16:57:08 +05:30
Kanchan Chauhan
b3573a881e
Shopping cart dropdown changes
2016-05-09 12:30:58 +05:30
Nabin Hait
332d29f166
Merge branch 'master' into develop
2016-05-06 16:13:35 +05:30
Neil Trini Lasrado
728d01945c
redirect issues of erpnext to erpnext repository
2016-05-02 18:37:47 +05:30
Rushabh Mehta
c711b82889
Merge pull request #5296 from KanchanChauhan/websitemakeover
...
New look to the website
2016-05-02 15:54:41 +05:30
Rushabh Mehta
764aa92da4
[minor] added remember_selected in hooks and doc update
2016-05-02 13:28:59 +05:30
Kanchan Chauhan
239b351367
New look to the website
2016-05-02 11:43:44 +05:30
Rushabh Mehta
be2ee18de4
[fixed] frappe.require is now async 💥
2016-04-29 17:22:42 +05:30
Rushabh Mehta
5dfe20ce17
[fix] frappe.require in stock_entry.js
2016-04-26 12:59:08 +05:30
Rushabh Mehta
3d2622ce91
[refacator] added dashboard in item
2016-04-25 17:53:42 +05:30
Anand Doshi
a6f48688bc
[enhancement] website: optionally show products as list
2016-04-22 19:10:49 +05:30
Anand Doshi
e3bd78e912
[css] portal
2016-04-22 18:53:21 +05:30
Kanchan Chauhan
e0818f8f46
Website Changes
2016-04-22 17:47:16 +05:30
Rushabh Mehta
0394aec6a4
[wip] inventory tool
2016-04-22 17:22:22 +05:30
Rushabh Mehta
621283c5c5
[enhancement] stock balance page
2016-04-21 19:00:34 +05:30
Rushabh Mehta
cd3c979207
[cleanup] website.less
2016-04-21 13:09:41 +05:30
Kanchan Chauhan
11638ba358
Changes 3
2016-04-20 16:24:25 +05:30
Kanchan Chauhan
704f248952
Changes 2
2016-04-20 16:24:24 +05:30
Kanchan Chauhan
2dbf5294a9
[WIP] No not merge
2016-04-20 16:24:24 +05:30
Rushabh Mehta
0525387328
[enhancement] added reserved_qty_for_production in bin and updated item dashboard
2016-04-18 19:27:46 +05:30
Saurabh
4bd34a58ba
[fixes] fix perpetual inventory
2016-04-18 15:57:55 +05:30
jof2jc
524ebbcbb9
Added Make Receipt (Update Stock) and IsCash option on Purchase Invoice
2016-04-18 15:57:55 +05:30
Rushabh Mehta
a305c29b0e
[cleanup] remove is_pro_applicable
2016-04-15 15:03:16 +05:30
Nabin Hait
972c25f78d
Fixed conflict
2016-04-14 18:25:53 +05:30
Rushabh Mehta
8c9c57c8f3
[minor] update party timestamp after transaction
2016-04-13 18:22:06 +05:30
Nabin Hait
1ce6df8ff6
Merge pull request #5203 from nabinhait/credit_limit_fix
...
[fix] Ignore closed sales order in credit limit validation
2016-04-13 15:36:33 +05:30
Nabin Hait
7132bd3659
[fix] Ignore closed sales order in credit limit validation
2016-04-13 15:19:37 +05:30
Nabin Hait
09855fc3cc
Merge pull request #5158 from neilLasrado/hotfix
...
Removed education as a domain in ERPNext setup wizard
2016-04-13 12:05:11 +05:30
Nabin Hait
c2ae1a7375
fixed merge conflict
2016-04-13 11:55:15 +05:30
Rushabh Mehta
8bbca6fa2e
[enhancement] links menu in customer, supplier, item
2016-04-12 19:16:33 +05:30
Rushabh Mehta
5d0e8dee11
[fix] dashboard for customer, supplier
2016-04-11 17:34:49 +05:30
Rohit Waghchaure
b2e7a1f605
[Fix] Default letter head
2016-04-11 17:30:44 +05:30
Anand Doshi
2f957f27b0
[fix] apply Tax Rule for lead
2016-04-08 17:43:08 +05:30
Rushabh Mehta
203cc962f5
[enhancement] Item Selector
2016-04-08 17:21:00 +05:30
Neil Trini Lasrado
ce893499d7
Removed education as a domain in ERPNext setup wizard
2016-04-08 16:52:53 +05:30
Rushabh Mehta
78b7a53635
[cleanup] set default bold, print_hide for prints
2016-04-06 15:29:45 +05:30
Kanchan Chauhan
7379fd4b9a
POS Search Fixed
2016-04-04 14:39:29 +05:30
Rushabh Mehta
bb8c6de043
[opt] transaction.js
2016-03-29 17:52:22 +05:30
mbauskar
a52472cf5b
[fixes] added fields in SI and DN, moved the margin calculation to to pricing_rule.py
2016-03-24 14:07:51 +05:30
mbauskar
c79415eb96
added rate and total margin in price_list
2016-03-24 14:07:49 +05:30
Nabin Hait
68a628ea1e
[fix] set recurring id after saving
2016-03-21 12:03:30 +05:30
rohitwaghchaure
cef1086441
[fix]Letterhead not being changed with change in company
2016-03-18 15:37:24 +05:30
Nabin Hait
6221117069
[fix] shipping address position in document
2016-03-16 16:23:30 +05:30
Saurabh
14d646f636
[fixes] shipping address on purchase flow
2016-03-16 16:23:30 +05:30
shreyas
77d23824df
[Partial]Some more changes to enable shipping address to be displayed in PO
2016-03-16 16:23:29 +05:30
shreyas
22d26a1d82
[Partial] Fix to add Shipping address in Purchase order
2016-03-16 16:23:29 +05:30
Neil Trini Lasrado
6e343e23d9
Renamed project_name to project
2016-03-15 17:50:53 +05:30
Nabin Hait
b1f0a7d52e
Merge pull request #4876 from saurabh6790/valuation_rate_on_so
...
[enhancement] get valuation rate and gross profit on sales order item
2016-03-14 19:18:58 +05:30
Anand Doshi
0179242f04
[fix] [hot] setup wizard domain
2016-03-09 16:32:13 +05:30
Saurabh
3fbf3ce852
[fixes] raise if selects product bundle as sub item in another product bundle.
2016-03-09 15:42:01 +05:30
Saurabh
5ada14b887
[fixes] calculate valuation rate for non stock item
2016-03-09 15:42:01 +05:30
Saurabh
2d7af63351
[fixe] typo-fixes and set base currency symbol to gross-profit and valuation rate
2016-03-09 15:42:00 +05:30
Saurabh
d313553ae3
[enhancement] get valuation rate and gross profit on sales order item
2016-03-09 15:42:00 +05:30
Neil Trini Lasrado
1b03e0a6d0
Added Other as a Domain in Company/setup wizard
2016-03-08 20:22:24 +05:30
Neil Trini Lasrado
342895c9df
Added Domain to setup wizard
2016-03-08 19:55:57 +05:30
Anand Doshi
b073cf4fa1
[fix] POS amount_paid when not cash - Fixes #4686 , #4828 , #4289
2016-03-08 17:59:19 +05:30
Rushabh Mehta
756e518bc1
[fix] recurring
2016-03-03 13:00:30 +05:30
Rushabh Mehta
5839a8d7f0
[fixes] usability cleanup of recurring document and added explicit submit_on_creation
2016-03-02 17:51:52 +05:30
Rushabh Mehta
aac4dcedc8
[fix] print language and contact_email fields and removed translations
2016-03-02 15:45:09 +05:30
Rushabh Mehta
cbed331047
Merge pull request #4909 from rohitwaghchaure/multilingual_print_format_test
...
Multilingual print format test
2016-03-01 17:10:50 +05:30
rohitwaghchaure
4151e3dc92
[enhancement] Multi-lingual print format
2016-03-01 16:33:08 +05:30
Rushabh Mehta
4403853828
[minor] fix notification for material request, splash icon, cleanup project form layout
2016-02-27 16:24:34 +05:30
Neil Trini Lasrado
3c0d5cbab5
Fixes in Setup Wizard
2016-02-24 18:02:08 +05:30
saurabh
f703198082
replaced methd
2016-02-23 02:17:03 +05:30
saurabh
533a0f6527
created new file
2016-02-23 02:17:03 +05:30
Anand Doshi
561e6cd27b
[fix] Trial Balance to General Ledger: use data.from_date and data.to_date
2016-02-16 11:56:53 +05:30
Anand Doshi
39a289145c
[fix] fetch price list rate
2016-02-15 11:42:18 +05:30
Rushabh Mehta
eab1671214
[fix] [pos] refresh party field, fixes #4789
2016-02-11 18:35:59 +05:30
Nabin Hait
ef864403a1
[fix] call get_party_account only if party is set
2016-02-10 14:47:25 +05:30
Rushabh Mehta
8d1c7a2524
[fix] call get_party_account only if party is set
2016-02-10 13:08:42 +05:30
Nabin Hait
a731ad4433
[fix] Set party account on chnage of company
2016-02-04 17:22:57 +05:30
Nabin Hait
bd7f48cfd4
[report] Financial Statements: Accumulated periodic balance based on filters
2016-02-02 19:05:43 +05:30
ShashaQin
539a826b37
Update financial_statements.js
...
Adding Accumulated Values check box on Profit and Loss, Balance Sheet
2016-02-02 19:05:42 +05:30
Anand Doshi
afe85bdd04
[hotfix] use me.frm.doc in get_item_details
2016-01-21 21:04:16 +05:30
Nabin Hait
0d207706c1
[fix] Get item details
2016-01-21 18:47:09 +05:30
Nabin Hait
fb0b24af78
Rounding based on smallest circulating currency fraction value
2016-01-20 17:07:35 +05:30
Nabin Hait
d4507ac6a0
[fix] Round off gle due to currency conversion
2016-01-20 16:14:27 +05:30
Nabin Hait
8b63b1221f
Calculate change in POS based on smallest currency fraction value
2016-01-18 17:56:55 +05:30
Rushabh Mehta
b46069d44b
[cleanup] contextual buttons in sales & purchase and fix rate setting in opp -> quotation and material request -> purchase order
2016-01-15 16:59:26 +05:30
Rushabh Mehta
66eaf7e1c3
Merge pull request #4607 from saurabh6790/group_custom_buttons
...
[enhance] merge customize buttons under groups
2016-01-15 11:15:23 +05:30
Rushabh Mehta
986f6a71ec
[minor] fix new customer link in POS
2016-01-14 18:15:56 +05:30
Saurabh
e23e99f4bd
[enhance] merge customize buttons under groups
2016-01-13 09:18:31 +05:30
Saurabh
3ade883fd9
[fixes] place cart button via js
2016-01-12 14:09:52 +05:30
Saurabh
403ad48364
[fixes] display cart count only if item exist in cart
2016-01-12 14:09:52 +05:30
Saurabh
69f9975748
[fixes] show link to visit cart after adding item, hide cart button on cart view
2016-01-12 14:09:52 +05:30
Saurabh
df2783dbb0
[enhance] i. facility to send PR email; ii. update cart, item view and order view;
2016-01-12 14:09:52 +05:30
Anand Doshi
d8ac0f3df7
[fix] removed duplicate 'region' section as it is already in Frappe Framework
2016-01-11 18:22:02 +05:30
Raul Viveros
1d5f8d4436
fix button "Edit" encode url in address and contact template
2016-01-09 22:18:14 +01:00
Rushabh Mehta
eb961370ff
[translations] fixes #4532
2016-01-04 15:48:37 +05:30
Nabin Hait
b6b56453e1
[fix] Get defaults based on doctype or fieldname
2015-12-23 16:37:06 +05:30
Nabin Hait
3769d87240
Additional Discount amount based on percentage
2015-12-18 13:12:08 +05:30
Anand Doshi
2af44ffd06
[fix] setup wizard is_private
2015-12-09 17:29:11 +05:30
Anand Doshi
70f57eb7f0
[fix] call apply price list, apply pricing rule only if price list is mentioned or there are items in the table
2015-11-27 14:38:01 +05:30
Anand Doshi
a4870118ea
Merge pull request #4365 from anandpdoshi/fix/print-hide-if-0
...
[fix] Show Credit/Debit as blank in Journal Entry Account if its value is 0
2015-11-25 17:28:54 +05:30
Anand Doshi
5c968abcef
[fix] Show Credit/Debit as blank in Journal Entry Account if its value is 0
2015-11-25 16:33:00 +05:30
Anand Doshi
5c3469a01e
[fix] validate fiscal year dates and company name
2015-11-24 17:06:54 +05:30
Nabin Hait
e8f4790d0a
[hotfix]
2015-11-16 18:10:15 +05:30
Nabin Hait
adc93b797a
Merge pull request #4316 from nabinhait/advance_fix
...
[fix] Invoice Outstanding calculation related to advance
2015-11-16 15:50:32 +05:30
Anand Doshi
1ed82834ce
[fix] re-make setup wizard slides on change of language
2015-11-16 12:58:14 +05:30
Nabin Hait
90c6d7bb47
[fix] Invoice Outstanding calculation related to advance
2015-11-13 14:04:03 +05:30
Rushabh Mehta
37b4d75e4a
[re-org] setup wizard in frappe
2015-11-12 11:45:47 +05:30
Rushabh Mehta
97426776bd
Merge pull request #4281 from nabinhait/address_fix
...
[fix] Clear addressed and contacts on a new form
2015-11-06 11:02:31 +05:30
Rushabh Mehta
b1d8979a59
Merge pull request #4179 from saurabh6790/drop-shipping
...
Drop shipping
2015-11-02 15:43:48 +05:30
Nabin Hait
915778fb69
[fix] Clear addressed and contacts on a new form
2015-10-30 14:43:13 +05:30
Anand Doshi
b0388d971a
[minor] reduced size of video placeholder
2015-10-30 12:54:10 +05:30
Saurabh
2e65aadb1e
[fixes] reload doc after status update and supplier address fetching
2015-10-29 19:43:35 +05:30
Saurabh
8a8ef85174
[fixes] reviwe fixes
2015-10-29 19:43:33 +05:30
Saurabh
c306b21415
[merge fixes]
2015-10-29 19:43:31 +05:30
Anand Doshi
7dab3c1f85
Show Welcome to ERPNext after completing Setup Wizard
2015-10-29 15:32:00 +05:30
Nabin Hait
bdfb070ed6
[fix] Serial No query in Warranty Claim
2015-10-28 15:38:22 +05:30
Nabin Hait
83e68bb837
minor fix
2015-10-26 17:40:31 +05:30
Nabin Hait
00818bfa90
Set tax rule based on date
2015-10-23 16:26:09 +05:30
Anand Doshi
87da662703
[enhancement] Quick Entry in Journal Entry, remember Posting Date
2015-10-21 16:27:13 +05:30
Nabin Hait
aa015902d5
Validate currency of default receivable/payable accounts
2015-10-19 15:10:11 +05:30
Rushabh Mehta
80d2a55342
[enhancement] add variants in website
2015-10-14 16:16:00 +05:30
Anand Doshi
9a4d165ba2
[fix] get_party_details.js - set posting_date if args are initialised
2015-10-12 16:23:51 +05:30
Anand Doshi
19a33994da
[cleanup] removed desk_home and desk_home_flows from conf.js
2015-09-29 20:06:22 +05:30
Anand Doshi
142859f36e
Merge pull request #4076 from anandpdoshi/shopping-cart-order
...
check doc.has_website_permission in order.html. Merge after frappe/frappe#1316
2015-09-28 19:40:17 +05:30
Rushabh Mehta
7f75dbf061
[cleanup] remove backup manager
2015-09-28 19:12:54 +05:30
Anand Doshi
199d8a44fc
[fix] check doc.has_website_permission in order.html
2015-09-28 19:04:42 +05:30
Anand Doshi
06ad308ca1
[fixes] setup wizard and other fixes related to cart
2015-09-23 12:50:35 +05:30
Rushabh Mehta
8ffd483e24
[wip] shopping cart shipping rule, price list cleanup
2015-09-23 12:49:16 +05:30
Rushabh Mehta
156ce607e2
[cleanup] [wip] portal, shopping cart cleanup
2015-09-23 12:49:16 +05:30
Neil Trini Lasrado
09f9c96c53
Fixes in Tax Rule
2015-09-15 15:41:00 +05:30
Neil Trini Lasrado
810bd35609
Apply Tax Rule based on Customer Selection in Sales / Purchase Transactions
2015-09-15 15:41:00 +05:30
Nabin Hait
bac9b8eef6
Payment Tool changes due to multi currency
2015-08-31 19:01:11 +05:30
Nabin Hait
13d8835b75
Fixed merge conflict
2015-08-27 14:55:34 +05:30
Nabin Hait
4ffd7f3d05
Outstanding, paid and write-off amount in Invoice
2015-08-27 12:28:36 +05:30
Rushabh Mehta
00eba4d7f6
[minor] show price list in sales order (via support ticket)
2015-08-27 10:25:07 +05:30
Rushabh Mehta
b8a6f40370
[cleanup] layouts of item, customer, supplier, lead
2015-08-26 10:51:45 +05:30
Rushabh Mehta
f24f6044bd
[layout] cleaned up Sales Invoice
2015-08-26 10:51:44 +05:30
Anand Doshi
fe13bfed44
Fixes to Return Improvements pull request
...
- Added "Returned Qty" in Sales and Purchase Order
- Map Expense Account in Return Delivery Note
- Defined some No Copy fields
- Added "Credit Note" and "Debit Note" Print Headings
- Fixed patch
2015-08-25 19:07:04 +05:30
Rushabh Mehta
ad9156a6ae
[enhancement] POS print after save #385:wq:wq
2015-08-18 18:05:43 +05:30
