Rohit Waghchaure
|
70be24d6f0
|
[Fix] Get account of the mode of payment on sales invoice and pos profile
|
2016-08-10 13:16:39 +05:30 |
|
Rohit Waghchaure
|
baef2624a2
|
Given provision to enter write off and change amount on POS
|
2016-08-10 00:50:53 +05:30 |
|
Rushabh Mehta
|
ec2d09c557
|
[minor] setting up website optional in setup wizard
|
2016-08-09 16:44:37 +05:30 |
|
Rohit Waghchaure
|
7127a8f522
|
Allow user to edit change amount from sales invoice form for is pos
|
2016-08-08 23:19:18 +05:30 |
|
Nabin Hait
|
3bb1a421f0
|
Change amount calcualtion in POS if there is write off amount and gl entries in this scenario
|
2016-08-02 16:41:15 +05:30 |
|
Rohit Waghchaure
|
a88dec8775
|
[Fix] batch no searching in pos
|
2016-08-01 13:01:13 +05:30 |
|
Nabin Hait
|
981f6ea34e
|
minor fix for item and employee link formatter
|
2016-07-31 11:44:43 +05:30 |
|
Rushabh Mehta
|
180e43585f
|
[minor] formatter for item and employee
|
2016-07-29 18:52:00 +05:30 |
|
Nabin Hait
|
7bae70a993
|
[fix] Show supplier name field if it is different from supplier id
|
2016-07-28 17:19:35 +05:30 |
|
akshay
|
14384c2787
|
[fix] serial no button
|
2016-07-28 13:53:17 +05:30 |
|
Faris Ansari
|
8e282c2ed8
|
[mobile ui] fix pos payment layout #5780
|
2016-07-24 11:37:25 +05:30 |
|
Rohit Waghchaure
|
ea278b5971
|
[Fix]POS and timesheet issues
|
2016-07-22 01:22:56 +05:30 |
|
Rushabh Mehta
|
7e472f898d
|
[fix] setup wizard
|
2016-07-21 18:01:42 +05:30 |
|
Rushabh Mehta
|
137e722af1
|
Merge pull request #5817 from rmehta/neilLasrado-schools
Merge schools, fix setup wizard, update domainify
|
2016-07-21 16:04:22 +05:30 |
|
Rushabh Mehta
|
20038ad2c9
|
[fixes] setup wizard and domainify for schools;
|
2016-07-21 16:01:59 +05:30 |
|
Rushabh Mehta
|
b0061c9341
|
Merge branch 'schools' of https://github.com/neilLasrado/erpnext into neilLasrado-schools
|
2016-07-21 10:46:32 +05:30 |
|
Nabin Hait
|
ba33026a6b
|
Merge pull request #5798 from rohitwaghchaure/sales_invoice_form_is_pos_issue
[Fix] POS auto set paid amount with outstanding amount issue
|
2016-07-21 09:39:57 +05:30 |
|
Rushabh Mehta
|
5a39d41a0c
|
[redesign] replace document flow with dashboard, sorry @saurabh6790, fixes #5792
|
2016-07-20 22:53:23 +05:30 |
|
Neil Trini Lasrado
|
3f0a581b85
|
Merge ERPNext Schools into ERPNext
|
2016-07-20 19:25:02 +05:30 |
|
Rushabh Mehta
|
39077d4210
|
[dashboard] for quotation and sales order
|
2016-07-20 18:55:42 +05:30 |
|
Rohit Waghchaure
|
61b4a43d84
|
[Fix] POS auto set paid amount with outstanding amount issue
|
2016-07-20 17:01:29 +05:30 |
|
Rohit Waghchaure
|
88514a246b
|
set paid amount with grand amount on invoice form
|
2016-07-19 20:04:44 +05:30 |
|
Rushabh Mehta
|
76b134192f
|
[fix] grid columns now restricted to 10
|
2016-07-18 14:30:27 +05:30 |
|
Rushabh Mehta
|
55ea7b1f61
|
[minor] set applicant name automatically
|
2016-07-15 16:43:25 +05:30 |
|
Rushabh Mehta
|
176b63b354
|
[fix] remove first row on mapping, fixes #5707
|
2016-07-14 17:43:48 +05:30 |
|
Saurabh
|
6bc7b892c4
|
[fix] alter fieldtype for is_group from select to check
|
2016-07-14 14:06:28 +05:30 |
|
Rushabh Mehta
|
3ce24d64c2
|
[cleanup] payment entry form view
|
2016-07-11 16:08:46 +05:30 |
|
Nabin Hait
|
3950507d4b
|
[fix] Currency and exchange rate while Quotation made from Opportunity for lead
|
2016-07-07 11:12:44 +05:30 |
|
Rohit Waghchaure
|
53bea82514
|
[Fixes] POS amount calculation issue
|
2016-07-06 16:15:10 +05:30 |
|
Anand Doshi
|
3177138655
|
[fix] moved disable setup wizard access to frappe
|
2016-07-05 21:34:21 +05:30 |
|
Saurabh
|
1c5c511d2e
|
[fix] add payment entry in document flow
|
2016-07-05 12:46:38 +05:30 |
|
Nabin Hait
|
56548cbfa2
|
Payment against negative invoice, negative outstanding allocation and much more
|
2016-07-04 11:42:25 +05:30 |
|
Nabin Hait
|
13093b4b68
|
Make payment entry aginst order, payment request and patch to rename advance table fields
|
2016-07-04 11:42:24 +05:30 |
|
Nabin Hait
|
05aefbbf5d
|
Payment Entry from invoice
|
2016-07-04 11:42:24 +05:30 |
|
Nabin Hait
|
28a0528ae4
|
Advance Payment Entry adjustment against Invoice
|
2016-07-04 11:42:04 +05:30 |
|
Saurabh
|
b35906efc1
|
[fix] load dependancies on page load event
|
2016-07-02 17:13:11 +05:30 |
|
Saurabh
|
feefaaf1ee
|
[fix] Stock Analytics Report page fix
|
2016-07-01 18:15:17 +05:30 |
|
Rushabh Mehta
|
65256ed8cb
|
Merge pull request #5526 from KanchanChauhan/shopping-cart-dropdown-update
Shopping cart dropdown update
|
2016-06-29 21:59:29 +05:30 |
|
Rushabh Mehta
|
26a76fb2d9
|
Merge pull request #5566 from KanchanChauhan/moving-newsletter-to-frappe
Newsletter moved to Frappe
|
2016-06-29 12:11:25 +05:30 |
|
Kanchan Chauhan
|
65c8b5a216
|
Newsletter moved to Frappe
|
2016-06-28 17:28:40 +05:30 |
|
Kanchan Chauhan
|
a756e3f765
|
Reverted changes
|
2016-06-28 15:02:35 +05:30 |
|
Kanchan Chauhan
|
c8d47da6bc
|
Shopping cart and dropdown cart update
|
2016-06-28 11:29:43 +05:30 |
|
Saurabh
|
93d68ac0c2
|
[fixes] change is group to check box
|
2016-06-27 17:16:56 +05:30 |
|
Saurabh
|
1702273968
|
[fix] rename account browser and sales browser to tree/doctype for view
|
2016-06-25 11:06:14 +05:30 |
|
Saurabh
|
3d6aecd618
|
[fixes] set warehouse group wise reorder level, validate ledger (leaf warehouse) on sle and bin
|
2016-06-25 11:06:13 +05:30 |
|
Rushabh Mehta
|
6e7dc12fde
|
Merge pull request #5476 from umairsy/14-jun
In the Setup Wizard, changed field label from Bank Account to Bank Name
|
2016-06-22 12:09:01 +05:30 |
|
Rushabh Mehta
|
2cb7a9f235
|
[ux] taxes table editable
|
2016-06-15 16:45:03 +05:30 |
|
Umair Sayyed
|
9a0ff298ce
|
Changed field label from Bank Account to Bank Name
|
2016-06-14 12:25:34 +05:30 |
|
Rohit Waghchaure
|
9fe40d557f
|
[POS] Enhancement to set default payment as cash, functionality to clear amount value, renamed doctype Payments and some fixes.
|
2016-06-14 01:11:09 +05:30 |
|
Rushabh Mehta
|
e0686b32f3
|
[minor] cleanups
|
2016-06-10 12:38:52 +05:30 |
|
Rushabh Mehta
|
e778e59e4c
|
[minor] always show issues in sidebar
|
2016-06-08 15:34:54 +05:30 |
|
Anand Doshi
|
16e2442278
|
[cleanup] document flow
|
2016-06-07 18:55:23 +05:30 |
|
Saurabh
|
2966d89e2a
|
[fixes] create module flow list
|
2016-06-07 17:19:36 +05:30 |
|
Rushabh Mehta
|
675f9c6e6e
|
[minor] reset barcode if item is changed, fixes #5314
|
2016-06-02 16:34:00 +05:30 |
|
Rushabh Mehta
|
aa60fd9037
|
[fix] new_doc to frappe.new_doc
|
2016-06-01 11:46:33 +05:30 |
|
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
|
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 |
|
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
|
d42167e0e5
|
[cleanup] remove Features Setup
|
2016-05-11 16:47:14 +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 |
|
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 |
|
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 |
|
rohitwaghchaure
|
4151e3dc92
|
[enhancement] Multi-lingual print format
|
2016-03-01 16:33:08 +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 |
|