Nabin Hait
5bedd649df
Merge pull request #4691 from anandpdoshi/cleanup/remove-is-service-item
...
[cleanup] Removed 'Is Service Item' checkbox and filters
2016-01-29 11:10:54 +05:30
Nabin Hait
b2206d1155
[fix] Multi currency advance payment against Order
2016-01-27 15:43:24 +05:30
Anand Doshi
01de945388
[cleanup] Removed 'Is Service Item' checkbox and filters
...
'Is Service Item' checkbox only worked for filtering Items in Maintenance Schedule and Maintenance Visit, and validating that Items in a Maintenance type Order were of type 'Service'. However, it doesn't fit an actual use case where any Sales Item could be given for Maintenance, making the checkbox an unnecessary addition.
2016-01-26 16:22:51 +05:30
shreyas
f76853a8d9
[Minor]Changed CustomerDisabled and CustomerFrozen to PartyDisabled and PartyFrozen
2016-01-25 21:25:11 +05:30
shreyas
29b565fdf5
Added Disabled field to Supplier and Customer doctype
...
Frozen field is moved to More Information section for Customer and Supplier. Any Supplier/Customer which is disabled will not be shown while creating PO/SO
2016-01-25 18:19:13 +05:30
Anand Doshi
5dcb40bc96
Merge pull request #4687 from anandpdoshi/fix/recurring-docs-no-copy
...
[fix] obey no_copy while creating recurring documents
2016-01-25 17:27:04 +05:30
Anand Doshi
39e2c2bb09
[fix] obey no_copy while creating recurring documents
2016-01-25 17:03:50 +05:30
Rushabh Mehta
e1a1c8ac31
[minor] clean up message if no Customer from Quotation > Sales Order, fixes #3854
2016-01-25 13:08:32 +05:30
Nabin Hait
9824e22ce1
[fix] Price list rate applied via set_missing_values
2016-01-19 16:48:32 +05:30
Nabin Hait
34d2822483
Fixes in get_item_details and test cases
2016-01-19 16:48:32 +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
Saurabh
e23e99f4bd
[enhance] merge customize buttons under groups
2016-01-13 09:18:31 +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
Saurabh
276d3e60bd
[enhance] pay via cart
2016-01-12 14:09:51 +05:30
Saurabh
2ffea6ba94
[document & fixes] document and test case rewrite
2016-01-12 14:09:51 +05:30
Saurabh
3ba22676bf
[fixes] Create and manage payment request
2016-01-12 14:09:50 +05:30
Saurabh
db7a56b453
[fixes] fieldtype, message fixes on Payment Request
2016-01-12 14:09:50 +05:30
Saurabh
cb98d9ec5f
[fixes] print format listing
2016-01-12 14:09:50 +05:30
Saurabh
b109ee96de
[fixes] Base structure for Payment Request
2016-01-12 14:09:49 +05:30
Saurabh
eba7aa496c
[enhace] basic structure for payment gateway
2016-01-12 14:09:49 +05:30
Rushabh Mehta
1ee5ae1e25
[fix] [minor] don't show cancelled sales orders
2016-01-06 16:47:18 +05:30
Anand Doshi
03e7e581d8
[minor] removed Communication table
2016-01-06 13:23:45 +05:30
Anand Doshi
06a82d4e1f
Merge pull request #4574 from rmehta/translations
...
Translation fixes
2016-01-05 18:41:18 +05:30
Anand Doshi
f9eff57531
[fix] credit limit
2016-01-05 16:00:33 +05:30
Rushabh Mehta
5760b79747
[translations] fixes #4533
2016-01-04 15:57:01 +05:30
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
Rushabh Mehta
1f63747916
[minor] [fix] add child in sales browser
2015-12-23 16:23:37 +05:30
Nabin Hait
3769d87240
Additional Discount amount based on percentage
2015-12-18 13:12:08 +05:30
Anand Doshi
2da81732eb
Merge pull request #4500 from rmehta/fixes-to-tree
...
[fix] rename tree item fixes #2524
2015-12-15 14:38:26 +05:30
Rushabh Mehta
e8ab320028
[fix] rename tree item fixes #2524
2015-12-15 12:06:37 +05:30
Nabin Hait
204af3ce90
[fix] Ignore user permission in target warehouse in SO
2015-12-11 15:01:02 +05:30
Saurabh
f6891975d5
[fixes] pull customer details only if drop shipping is marked
2015-12-09 15:04:12 +05:30
Nabin Hait
694373d022
Fixed conflict
2015-12-08 15:30:15 +05:30
Saurabh
70ed6ede5c
[fixes] patch to update delivery status for drop ship item
2015-12-08 14:48:19 +05:30
Saurabh
01ca354d52
[fixes] Drop Shipping - Purchase Order Cancellation - Sales Order Status
2015-12-08 14:03:09 +05:30
Nabin Hait
a974ab3dc5
[fix][patch] Create Tax Rule based on default taxes and charges template in Customer and Supplier
2015-12-08 12:56:14 +05:30
Saurabh
4f39fd243e
[fixes] recreate print format, shipping address on po for drop ship, validate update stock
2015-12-06 10:09:06 +05:30
Nabin Hait
d793fc9446
[fix] Mapping allowed for negative quantity
2015-12-01 17:28:12 +05:30
Anand Doshi
ddad05dab3
[fix] Customer de-duplication sql
2015-11-20 17:29:40 +05:30
Anand Doshi
602e8253be
[enhancement] Int, Currency, Float, Percent as not null and default to 0
2015-11-19 13:23:36 +05:30
Saurabh
b65c69f9eb
[fixes] drop ship test case fixes
2015-11-18 17:39:26 +05:30
Saurabh
2e292060c5
[fix] Reserved and ordered qty fix for drop ship orders
2015-11-18 17:39:26 +05:30
Saurabh
55222a5b82
[fixes] test case fixes
2015-11-18 17:39:26 +05:30
Anand Doshi
da79740cdf
[fix] injection
2015-11-17 18:27:50 +05:30
Anand Doshi
cea5479f4d
[fix] Don't show Receive for a Purchase Order having non-stock items, show Close button only for users with Submit rights
2015-11-12 18:39:57 +05:30
Anand Doshi
4e72ef1421
[fix] Allow both Purchase Order and Delivery from Sales Order, based on drop shipping checkbox
2015-11-09 13:01:49 +05:30
Rushabh Mehta
4268b0092a
[minor] don't show po / mr buttons if delivered
2015-11-06 16:52:18 +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
Saurabh
d805bd7daf
[fixes] update delivery status
2015-11-04 16:40:09 +05:30
Rushabh Mehta
ac53f2dbb1
[test] [fix]
2015-11-04 15:47:08 +05:30
Rushabh Mehta
20a7d820ab
[fix] shot ledger buttons for closed DN / PR
2015-11-04 15:31:41 +05:30
Rushabh Mehta
d48c2394e8
[cleanup] drop ship testing & cleanup
2015-11-04 15:24:04 +05:30
Saurabh
b7f0a4961e
- no delivery / reserve warehouse in drop ship
...
- “Re-open” in DN / PR after “Stop” / “Close"
- check for closed status in reports
2015-11-04 12:03:54 +05:30
Rushabh Mehta
9c044eefff
[cleanup] re-arrange drop ship field
2015-11-03 18:28:37 +05:30
Rushabh Mehta
5951692db0
[fix] cleanup stop-resume code
2015-11-03 18:20:39 +05:30
Rushabh Mehta
b1d8979a59
Merge pull request #4179 from saurabh6790/drop-shipping
...
Drop shipping
2015-11-02 15:43:48 +05:30
Rushabh Mehta
ec2d0030b7
Merge pull request #4265 from nabinhait/jv_fix
...
[cleanup] Make Payment Entry from Order/Invoice
2015-11-02 15:23:01 +05:30
Saurabh
7cd0ba70d9
[fixes] typo error
2015-11-02 15:18:23 +05:30
Nabin Hait
66340f9894
[cleanup] Make Payment Entry from Order/Invoice
2015-11-02 14:40:47 +05:30
Saurabh
a8a91cca16
[feature] Close feature for Purchase Receipt and Delivery Note
2015-11-02 12:57:08 +05:30
Nabin Hait
915778fb69
[fix] Clear addressed and contacts on a new form
2015-10-30 14:43:13 +05:30
Saurabh
6956eee790
[fixes] test case and code rewrite
2015-10-29 19:43:35 +05:30
Saurabh
2e65aadb1e
[fixes] reload doc after status update and supplier address fetching
2015-10-29 19:43:35 +05:30
Saurabh
653cffec1e
[change_log and fixes] set print hide, add change_log
2015-10-29 19:43:35 +05:30
Saurabh
cc8f1afa56
[fixes] test case fixes for drop shipping
2015-10-29 19:43:35 +05:30
Saurabh
2f702dcb32
[fixes] bulk close facility, rename Drop Ship to Delivered By Supplier
2015-10-29 19:43:35 +05:30
Saurabh
f857d81f35
[fixes]test case to check updated delivered qty
2015-10-29 19:43:34 +05:30
Saurabh
6d64fe378d
[fixes] remover per_ordered field and update delivered qty from perchase order via delivered by supplier -1
2015-10-29 19:43:34 +05:30
Saurabh
b0ab93f779
[fixes] typo error
2015-10-29 19:43:34 +05:30
Saurabh
df1c1a573f
[fixes] test case for per_ordered
2015-10-29 19:43:34 +05:30
Saurabh
a1f2aec918
[fixes] check ordered and reserved qrt, check closed status for so and po
2015-10-29 19:43:34 +05:30
Saurabh
d8930a776d
[fixes] test case import fix
2015-10-29 19:43:34 +05:30
Saurabh
8a8ef85174
[fixes] reviwe fixes
2015-10-29 19:43:33 +05:30
Saurabh
edba048c14
[fixes] set is_stock_item for test items
2015-10-29 19:43:33 +05:30
Saurabh
5e0b0b4b97
[enhance] make PO from SO if supplier is specified
2015-10-29 19:43:33 +05:30
Saurabh
e930f0f74e
[fixes] filter on supplier list for DropShip, checking closed status
2015-10-29 19:43:33 +05:30
Saurabh
99543f72d8
[fixes] test case for drop shipping and minor fixes for test_reserved_qty_for_partial_delivery & test_reserved_qty_for_partial_delivery_with_packing_list
2015-10-29 19:43:32 +05:30
Saurabh
1a9646739a
[fixes][rename-field-name] drop_ship to is_drop_ship
2015-10-29 19:43:32 +05:30
Saurabh
bd65cb8817
[fixes] field rename and test case for drop ship
2015-10-29 19:43:32 +05:30
Saurabh
98b287565a
[enhance] close purchase order
2015-10-29 19:43:32 +05:30
Saurabh
c6dbe70256
[Fixes] Drop Shipping
2015-10-29 19:43:32 +05:30
Saurabh
556536615e
[minor fix] Status fix in listview
2015-10-29 19:43:31 +05:30
Saurabh
8bd96f1c08
[Test Case] Test case to check drop shipping
2015-10-29 19:43:31 +05:30
Saurabh
5b7e9a1c94
[minor fixes]
2015-10-29 19:43:31 +05:30
Saurabh
c306b21415
[merge fixes]
2015-10-29 19:43:31 +05:30
Nabin Hait
398c83afa5
[fix] For Serial No Status
2015-10-22 15:11:44 +05:30
Neil Trini Lasrado
d4357e80d7
Fixed Test Cases
2015-10-20 16:21:02 +05:30
Anand Doshi
1d093a4039
[fix] change attach fields to small text
2015-10-19 12:56:29 +05:30
Saurabh
c0cee82727
[small fixes] frozen customer testcase
2015-10-14 18:03:07 +05:30
Saurabh
4c53931363
[fixes and test case] test case to avoid duplicate customer name exection
2015-10-14 18:03:07 +05:30
Saurabh
53f7e6281c
[fix] Duplicate Customer Name Error
2015-10-14 18:03:07 +05:30
Rushabh Mehta
ee6862b277
[fix] VARCHAR lengths as 140
2015-10-14 17:28:35 +05:30
Rushabh Mehta
80d2a55342
[enhancement] add variants in website
2015-10-14 16:16:00 +05:30
Anand Doshi
71ebad5668
Limit varchar length to 140 instead of 255 to mitigate Row Size Too Large error
2015-10-14 16:13:49 +05:30
Nabin Hait
c865f229fb
Target Warehouse in Delivery Note and Sales Invoice and removed Serial No status
2015-10-13 15:46:42 +05:30
Rushabh Mehta
fd294eb981
Merge pull request #4154 from rmehta/sales-analytics-fix
...
[minor] [fix] Use customer_name in Sales Analytics
2015-10-12 18:32:39 +05:30
Rushabh Mehta
a7099eaa8d
[minor] [fix] Use customer_name in Sales Analytics
2015-10-12 16:22:10 +05:30
Nabin Hait
51e980dd2c
[fix] Multiple minor fixes
2015-10-10 18:10:05 +05:30
Nabin Hait
bcd655a985
Merge pull request #4109 from rmehta/fix-sales-purchase-order-status
...
[fix] sales & purchase order status
2015-10-07 11:34:30 +05:30
Nabin Hait
5c66fb7631
Merge pull request #4130 from nabinhait/reports
...
[fix][report] Left join used in pending reports
2015-10-07 11:15:36 +05:30
Nabin Hait
54ecc8ebba
minor fix in credit limit
2015-10-06 14:28:41 +05:30
Nabin Hait
f4edaef481
[fix][report] Left join used in pending reports
2015-10-06 12:48:04 +05:30
Rushabh Mehta
d10ba853e6
[fix] sales & purchase order status
2015-10-02 17:16:51 +05:30
Anand Doshi
673887455f
[fix] Show Contribution (%) in Sales Team table in Customer Form
2015-10-01 11:21:25 +05:30
Anand Doshi
21f6ea6f7e
[hotfix] remove allow on submit from item tables
2015-09-30 18:45:29 +05:30
Anand Doshi
4945b94950
[fix] added validation to match account currency with existing gle and test case
2015-09-30 16:41:15 +05:30
Anand Doshi
248c867a2c
[minor] removed test case for party multi-currency validation, since party multi-currency is now based on account
2015-09-30 15:11:13 +05:30
Anand Doshi
da98ab6f3c
[fix] Only 1 account per company for a party
2015-09-30 15:11:12 +05:30
Anand Doshi
b20baf894f
[fix] Remove party_account_currency from Customer and Supplier, and use currency derived from get_party_account
2015-09-30 15:11:12 +05:30
Rushabh Mehta
b5ff9421e1
[optimize] customer outstanding query
2015-09-25 12:25:12 +05:30
Anand Doshi
c6e4b5978d
[fix] Sales Order - get_query fix
2015-09-24 11:32:54 +05:30
Anand Doshi
e2d46d0474
[fix] Allow Sales Team to be added/updated after submit
2015-09-23 19:26:29 +05:30
Anand Doshi
b07b0a9e54
[fix] Sales Order indicators for Maintenance
2015-09-23 15:52:11 +05:30
Anand Doshi
b6ec680c46
[fix] round percentages in get_indicator
2015-09-22 16:36:20 +05:30
Anand Doshi
0332f83bc2
[fix] customer naming series validation and patch to fix missing default taxes and lead
2015-09-17 19:01:48 +05:30
Anand Doshi
5532a14938
[hotfix] create customer contact and address from lead only on create
2015-09-17 18:27:56 +05:30
Nabin Hait
77ca80217c
[fix] Account Currency and Balance fixed in chart of accounts #4019
2015-09-17 14:43:33 +05:30
Nabin Hait
87c2d1d634
[fix] Dashboard info in accounting currency for Customer and Supplier #4017
2015-09-17 14:16:01 +05:30
Anand Doshi
86102064a5
[fix] Use add_fetch in Product Bundle, Maintenance Visit and Maintenance Schedule instead of redundant get_item_details method
2015-09-15 11:50:30 +05:30
Anand Doshi
dbe623b167
[fix] Use User Permission value as default only if the document type is Setup
2015-09-14 13:08:53 +05:30
Anand Doshi
71e51c179c
[fix] changed modified for multi-currency sync
2015-09-11 16:55:11 +05:30
Anand Doshi
5d9cfc76cd
Don't copy title field in Duplicate
2015-09-11 15:35:26 +05:30
Rushabh Mehta
d461d462aa
[minor] rename notified_modifed > notified_update. Merge with #1296
2015-09-11 15:34:41 +05:30
Nabin Hait
2377cdfa4e
Fixed conflict
2015-09-09 18:45:41 +05:30
Anand Doshi
9d5b84e78a
Merge pull request #3996 from nabinhait/fix6
...
Check credit limit in Delivery Note / Sales Invoice, only if not created against Sales Order
2015-09-09 15:11:12 +05:30
Nabin Hait
cd103c05d6
Check credit limit in Delivery Note / Sales Invoice, only if not created against Sales Order
2015-09-08 19:24:35 +05:30
Anand Doshi
bc1e8b4408
[minor] Unset Apply User Permissions in default permissions
2015-09-08 19:23:23 +05:30
Nabin Hait
6c3ff3e2ed
Fixed conflict
2015-09-08 18:09:03 +05:30
Anand Doshi
43888546f6
Merge pull request #3968 from rmehta/task-not-mandatory
...
[minor] task not mandatory for Time Log and Expense Claim #3904
2015-09-08 15:47:11 +05:30
Nabin Hait
2249eea59f
Fixed conflict
2015-09-08 12:55:21 +05:30
Anand Doshi
cba99743a4
[fix] Customer match condition in autosuggest
2015-09-07 14:51:30 +05:30
Rushabh Mehta
be9edae961
[fixes] to task test case and fix tree ui for mobile
2015-09-04 16:18:17 +05:30
Nabin Hait
11a746d363
Fixed conflict
2015-09-03 16:04:11 +05:30
Nabin Hait
1609933748
Test cases for multi currency
2015-09-03 16:03:07 +05:30
Nabin Hait
98096771c2
[multi currency] Introduced Accounting Currency in Customer and Supplier, and validation according to that
2015-09-03 10:28:08 +05:30
Nabin Hait
76bb927337
Fixed conflict
2015-08-31 17:28:05 +05:30
Rushabh Mehta
8f1391dc96
[enhancement] calendar for sales order and other related fixes #3542
2015-08-31 12:42:45 +05:30
Nabin Hait
6e439a5e53
Multi currency: test case and fixes
2015-08-28 19:24:22 +05:30
Anand Doshi
3d9d2d1dd1
Exported all doctypes
2015-08-27 17:04:39 +05:30
Anand Doshi
57a51351d3
[fix] Changed more section label to 'More Information'
2015-08-27 17:04:06 +05:30
Anand Doshi
77a2107973
[minor] In Sales Order, changed label from PO No. to Customer's Purchase Order
2015-08-27 17:04:05 +05:30
Rushabh Mehta
c5346c99de
[enhancement] allow user to set warning for multiple items and sales order against multiple purchase orders #3699
2015-08-27 17:03:37 +05:30
Nabin Hait
78be566428
minor fix
2015-08-27 16:27:44 +05:30
Nabin Hait
13d8835b75
Fixed merge conflict
2015-08-27 14:55:34 +05:30
Nabin Hait
2091f0c97e
Checked out json files from upstream
2015-08-27 14:35:17 +05:30
Anand Doshi
282e4947fa
[fix] Changed more section label to 'More Information'
2015-08-27 13:11:46 +05:30
Nabin Hait
4ffd7f3d05
Outstanding, paid and write-off amount in Invoice
2015-08-27 12:28:36 +05:30
Anand Doshi
b99c180466
Merge branch 'rmehta-validation-settings' into develop
2015-08-27 12:22:06 +05:30
Anand Doshi
6cf193d432
[minor] In Sales Order, changed label from PO No. to Customer's Purchase Order
2015-08-27 12:21:17 +05:30
Nabin Hait
35a5c87cbf
[fix] Clear notifications for Sales / Purchase Order on stop/unstop
2015-08-27 12:06:11 +05:30
Rushabh Mehta
740db53b86
[fix] returned_qty reapply and change-log
2015-08-27 12:00:16 +05:30
Anand Doshi
69b6195d3b
Merge branch 'validation-settings' of https://github.com/rmehta/erpnext into rmehta-validation-settings
...
Conflicts:
erpnext/stock/doctype/delivery_note/delivery_note.py
2015-08-27 11:39:20 +05:30
Rushabh Mehta
f7800c053b
[layout cleanup] in Quotation, Sales Order, Delivery Note
2015-08-26 18:53:37 +05:30
Rushabh Mehta
b8a6f40370
[cleanup] layouts of item, customer, supplier, lead
2015-08-26 10:51:45 +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
3c107cdbf8
[enhancement] allow user to set warning for multiple items and sales order against multiple purchase orders #3699
2015-08-25 14:26:42 +05:30
Nabin Hait
3f321ebfde
utilities/repost_stock file renamed to stock/stock_balance
2015-08-25 14:11:13 +05:30
Nabin Hait
047ecd1eb9
Update order reference in return entries and repost reserved / ordered qty
2015-08-25 14:11:13 +05:30
Nabin Hait
1f94fa25a8
Update delivered / ordered qty in sales/purchase order from return entry
...
Reserved Qty logic cleaned up
2015-08-25 14:11:12 +05:30
Rushabh Mehta
12fb0d998f
[fix] Customer Address and Contact report
2015-08-24 12:21:04 +05:30
Nabin Hait
c561a499d7
Multi currency GL entry fixes
2015-08-21 14:31:47 +05:30
Nabin Hait
6aea1c0da5
Currency validation in gl entry
2015-08-21 14:31:46 +05:30
Rushabh Mehta
aeab6c559c
[enhancement] multi-currency, added fields #1002
2015-08-21 14:31:46 +05:30
Rushabh Mehta
81e9d4e8f5
[fix] changed text > text editor for description fields in tables
2015-08-19 13:00:03 +05:30
Rushabh Mehta
1d1f1b06d9
[minor] notify stop/unstop
2015-08-18 17:26:50 +05:30
Rushabh Mehta
1828c12481
[refactor] added dynamic link in journal entry, #3847
2015-08-12 12:28:33 +05:30
Anand Doshi
7d45929872
Merge pull request #3829 from dottenbr/customer-taxid
...
Tax ID added and Customer Details description updated
2015-08-11 12:33:32 +05:30
Dominik
d1416542a0
Tax ID added and Customer Details description updated
...
Tax ID is a relatively generic descriptor for VAT (Value Added Tax) or any other countrie's tax identification system and should be required by most users of an ERP system. Since this removes the necessity to put the VAT into the Customer Description (not the ideal place to begin with) the description was updated and slimmed down.
2015-08-08 00:05:38 +05:30
Rushabh Mehta
48cccca9af
[minor] add close button in opportunity and project links in customer
2015-08-06 15:37:01 +05:30
Rushabh Mehta
5bd394278d
[fix] test-case, warehouse mandatory for mix type product bundle
2015-08-04 14:49:25 +05:30
Rushabh Mehta
a208c56813
[enhancement] auto insert item price if missing, #3533
2015-08-04 14:48:52 +05:30
Rushabh Mehta
862a2eb975
[enhancement] make service type product bundle:
2015-08-04 14:47:45 +05:30
Nabin Hait
d46fb5eb8c
Merge pull request #3743 from rmehta/indicator-fix
...
[fix] indicators for sales order, purchase order #3736
2015-07-29 15:53:44 +05:30
Rushabh Mehta
2f3b097d63
[fix] indicators for sales order, purchase order #3736
2015-07-29 13:08:27 +05:30
Rushabh Mehta
1e8025b327
[cleanup] yes/no selects changed to checks in Item
2015-07-29 11:38:33 +05:30
Neil Trini Lasrado
cc7cb2a70a
Allowed frozen_accounts_modifier to create records against frozen customer/supplier
2015-07-28 12:17:03 +05:30
Neil Trini Lasrado
79bf233734
Test Cases added to check if customer is frozen
2015-07-28 12:17:03 +05:30
Neil Trini Lasrado
3698b84d7c
Typo fixes in Supplier and Customer Document
2015-07-28 12:17:02 +05:30
Neil Trini Lasrado
3fbbb71afc
Added ability to freeze Customer/Supplier
2015-07-28 12:17:02 +05:30
Anand Doshi
8e8e9c61ca
[minor] Show description in Sales Order
2015-07-28 10:46:14 +05:30
Nabin Hait
3cf67a462b
Cleanup and test cases for serialized item
2015-07-24 13:26:54 +05:30
Nabin Hait
1d21842f68
Sales / Purchase Return redesigned via negative DN / SI / PR / PI
2015-07-24 13:26:53 +05:30
Neil Trini Lasrado
05d8174696
Fetch items from Packing List if Exists in Sales Order while raising Material Request against SO
2015-07-22 16:31:34 +05:30
Anand Doshi
285135da8e
[ui] Remove 'Stopped' alert banner in Sales Order
2015-07-17 15:14:40 +05:30
Rushabh Mehta
94157334a7
[rename] Material User > Stock User
2015-07-13 15:06:12 +05:30
Neil Trini Lasrado
1cd049d824
Sales BOM to Product Bundle rename changes
2015-07-13 14:17:42 +05:30
Neil Trini Lasrado
09a66c4201
Fixed issue with Customer Contacts in Transaction Documents
2015-07-13 12:41:27 +05:30
Neil Trini Lasrado
ed8cecbdd8
Sales BOM renamed to Product Bundle
2015-07-13 12:41:27 +05:30
Nabin Hait
6e38e917eb
Reserved warehouse should not be validated on cancellation of sales order
2015-07-13 11:36:36 +05:30
Nabin Hait
4770a1abb5
Customer's credit days based on fixed days / last day of the next month
2015-07-09 16:35:53 +05:30
Neil Trini Lasrado
ebb60f5dbc
Fixed issues in Expired Batches while making Stock Entry
2015-07-08 15:24:02 +05:30
Nabin Hait
73b7efd61d
Merge pull request #3583 from rmehta/quotation-list-fix
...
[fix] quotation list #3492
2015-07-06 14:31:23 +05:30
Rushabh Mehta
56912791e2
[fix] quotation list #3492
2015-07-06 11:14:31 +05:30
Rushabh Mehta
85e6f5d04e
[fix] [minor] fix customer_name, supplier_name labels
2015-07-03 12:59:08 +05:30
Rushabh Mehta
5105f909d6
[fix] show item description in form grid based on in_list_view
2015-07-02 15:09:18 +05:30
Nabin Hait
56bc215855
Merge pull request #3505 from neilLasrado/print-format
...
Recurring Invoice Print Format
2015-06-29 18:54:24 +05:30
Neil Trini Lasrado
a1f1edc786
Typo fixes in Sales Person
2015-06-29 16:04:12 +05:30
Neil Trini Lasrado
e2d8dd0663
added recurring print format to sales/purchase invoice and order
2015-06-29 12:50:41 +05:30
Nabin Hait
7c5ba957ac
Label changed for discount amount in base currency
2015-06-15 15:47:07 +05:30
Neil Trini Lasrado
587bd144d5
Added Customers Not Buying Since Long Time against Sales Invoice
2015-06-11 18:36:52 +05:30
Neil Trini Lasrado
d015195617
fixes in barcode
2015-06-09 15:21:50 +05:30
Nabin Hait
c87595b2da
show item description in item grid view if marked for 'In List View'
2015-06-03 11:24:37 +05:30
Nabin Hait
42f2674cba
dynamic link in quotation item
2015-06-03 11:24:37 +05:30
Rushabh Mehta
d3fe7ec858
[cleanup] customer not buying since long time report
2015-06-02 12:21:17 +05:30
Rushabh Mehta
99b18224f5
[minor] remove order_by in listview, let user customize
2015-05-29 12:48:24 +05:30
Nabin Hait
e7b37af525
Merge pull request #3353 from rmehta/barcode-fix
...
[fix] clear barcode from table, fixes #3320
2015-05-28 11:07:16 +05:30
Nabin Hait
10026ea85c
Merge pull request #3354 from rmehta/discount-field-relabel
...
[cleanup] rename discount and reserver warehouse #3325
2015-05-28 11:02:51 +05:30
Rushabh Mehta
69fb13f229
[cleanup] rename discount and reserver warehouse #3325
2015-05-27 12:20:07 +05:30
Rushabh Mehta
c2acfc9828
[fix] clear barcode from table, fixes #3320
2015-05-27 12:01:03 +05:30
Anand Doshi
fb4e496b54
[fix] target variance sql
2015-05-26 18:15:55 -04:00
Nabin Hait
1f5b21673c
minor fix in report
2015-05-26 12:15:39 +05:30
Nabin Hait
2c6705ef83
Merge pull request #3322 from nabinhait/test_case
...
Test case
2015-05-25 16:19:03 +05:30
Nabin Hait
c4fa74f51d
sales partner field added in sms center
2015-05-25 15:17:29 +05:30
Nabin Hait
b62068f784
removed debug
2015-05-25 14:46:12 +05:30
Nabin Hait
43539673cc
[fix] sales person wise transaction summary
2015-05-25 14:13:03 +05:30
Nabin Hait
fd4bcd855b
test case fixes
2015-05-22 16:55:55 +05:30
Nabin Hait
2eba53f763
test case fixes
2015-05-22 16:55:55 +05:30
Neil Trini Lasrado
68a6d61589
filter added for closed oppurtunity
2015-05-20 19:01:37 +05:30
Neil Trini Lasrado
c55edf18ad
fixes in quotation - from opportunity
2015-05-20 18:51:38 +05:30
Rushabh Mehta
476019a930
[fix] throw name error for duplicate group
2015-05-19 13:03:01 +05:30
Rushabh Mehta
4a3c805049
[fix] sms settings, fixes #3276
2015-05-19 11:10:12 +05:30
Rushabh Mehta
632fb3879e
[fix] sms center, fixes #3274
2015-05-19 11:00:10 +05:30
Rushabh Mehta
770c258406
[test-fix] case
2015-05-18 12:43:46 +05:30
Rushabh Mehta
9dd8aab211
[fix] status updater
2015-05-18 11:19:10 +05:30
Nabin Hait
f78283fbff
customer and supplier dashboard info
2015-05-15 16:58:51 +05:30
Rushabh Mehta
e2e1471f4d
[fix] fix breadcrumbs for sales browser fixes #3240
2015-05-15 14:05:10 +05:30
Nabin Hait
90fc19ed9a
Item image in print view
2015-05-14 12:32:26 +05:30
Nabin Hait
2f243f4d08
Merge pull request #3242 from neilLasrado/crm
...
view leads button added to campaign
2015-05-13 19:34:36 +05:30
Rushabh Mehta
92015a1268
[fix] [minor] escape in report
2015-05-12 11:32:25 +05:30
Neil Trini Lasrado
6c85479e4f
view leads button added to campaign
2015-05-11 17:56:36 +05:30
Rushabh Mehta
ab1ed013b3
[hot] taxes
2015-05-08 11:09:25 +05:30
Rushabh Mehta
55dc66ffcc
[fix] index for sales order item
2015-05-07 18:16:49 +05:30
Rushabh Mehta
009378e187
[rename]
2015-05-06 22:59:00 +05:30
Rushabh Mehta
bcdea3ea51
[rename] Sales/Purchase Taxes and Charges Master > Sales/Purchase Taxes and Charges Template
2015-05-06 18:45:47 +05:30
Rushabh Mehta
5dbf8a7418
[cleanup] frappe.get_user
2015-05-01 11:51:26 +05:30
Nabin Hait
aa03a8e3a2
Migrate customized precision for newly created total fields
2015-04-30 16:13:47 +05:30
Nabin Hait
042f86e555
advance paid should not be copied and patch to fix affected records
2015-04-28 13:00:23 +05:30
Rushabh Mehta
38c6b52770
[rename] group_or_ledger to is_group
2015-04-23 13:14:17 +05:30
Nabin Hait
b650d691a0
fixed conflict
2015-04-21 17:16:28 +05:30
Nabin Hait
2029ea9abf
toggle editable price list rate
2015-04-16 17:55:35 +05:30
Nabin Hait
c3daa91c8a
Reset no-copy fields for recurring docs and patch to fix
2015-04-16 13:13:18 +05:30
Pratik Vyas
2437d4cce2
Fix #3046 Customer Acquisition and Loyalty repor
2015-04-10 12:35:43 +05:30
Nabin Hait
4642d0697e
fixed conflict
2015-04-09 11:42:24 +05:30
Anand Doshi
0dc79f4de0
Merge remote-tracking branch 'frappe/v4.x.x' into develop
...
Conflicts:
.travis.yml
erpnext/__version__.py
erpnext/controllers/queries.py
erpnext/hooks.py
erpnext/selling/sales_common.js
erpnext/stock/doctype/bin/bin.py
erpnext/stock/doctype/stock_entry/stock_entry.js
erpnext/stock/doctype/stock_entry/stock_entry.py
erpnext/stock/stock_ledger.py
setup.py
2015-04-06 13:21:07 +05:30
Rushabh Mehta
7c32770a69
move opportunity item to CRM
2015-04-02 22:06:36 +05:30
Rushabh Mehta
918ddf2537
[task] open, close from list:
2015-04-01 15:43:14 +05:30
Rushabh Mehta
aefc01372f
[listview] issue: open, close | so, po: stop, unstop
2015-03-31 13:39:42 +05:30
Sambhaji Kolate
a4fa96cc79
some fix in batch related cleanup
2015-03-30 16:04:55 +05:30
Anand Doshi
6208c49859
Added Company field in various Query Reports
2015-03-30 15:21:20 +05:30
Nabin Hait
da5cfb1630
Exchange rate upto 9 decimals
2015-03-23 14:51:45 +05:30
Nabin Hait
ca7e778f82
modified date updated
2015-03-23 14:17:59 +05:30
Nabin Hait
2ed71bac20
Batch related cleanup
2015-03-20 15:06:30 +05:30
Nabin Hait
60aee54c6c
currency in test records
2015-03-18 16:06:13 +05:30
Nabin Hait
87ee502dfd
Merge pull request #2949 from sbktechnology/develop
...
update get_batch_no query to sort batch with expiry date
2015-03-18 14:29:13 +05:30
Nabin Hait
a1bf43b1a6
Merged develop into v5
2015-03-17 10:50:47 +05:30
Nabin Hait
f2791f8898
manipulate_grand_total_for_inclusive_tax
2015-03-16 17:01:09 +05:30
Anand Doshi
ead48094b6
manipulate diff only if diff <= 0.02
2015-03-13 18:59:01 +05:30
Anand Doshi
d6822ddd7c
manipulate grand total for inclusive tax
2015-03-13 18:23:10 +05:30
Anand Doshi
9d9e31f4e8
moved get_list_context to module
2015-03-13 12:48:05 +05:30
Nabin Hait
7c9d003917
Test case cleanup and fixes
2015-03-13 08:14:46 +05:30
Nabin Hait
c8c1d1c693
Test case fixes
2015-03-13 08:14:45 +05:30
Sambhaji Kolate
feff40a930
update get_batch_no query to sort batch with expiry date
...
small fix to avoid error msg if item_code not selected and batch_no is entered
2015-03-11 11:50:28 +05:30
Sambhaji Kolate
845f1c636e
code cleanup
2015-03-10 15:19:29 +05:30
Sambhaji Kolate
98dbccd1d6
added actual_batch_qty at warehouse in DN & SI #1873
2015-03-10 15:04:28 +05:30
Rushabh Mehta
f5f0d5a83a
[breadcrumbs] refactor
2015-03-09 15:48:16 +05:30
Anand Doshi
e514323be4
load all js and css like before in desk.html
2015-03-06 13:17:26 +05:30
Nabin Hait
b50833a1e8
Fields alignment
2015-03-04 16:14:02 +05:30
Anand Doshi
885e074697
Changed company name from Web Notes to Frappe Technologies
2015-03-03 14:56:43 +05:30
Anand Doshi
5bd8cfd9fe
[fix] queries
2015-02-26 12:40:58 +05:30
Nabin Hait
8be6939288
help description for party account
2015-02-26 12:31:07 +05:30
Anand Doshi
d35354cc06
Merge remote-tracking branch 'frappe/develop' into v5.0
...
Conflicts:
erpnext/__version__.py
erpnext/accounts/doctype/budget_distribution/test_budget_distribution.py
erpnext/accounts/doctype/chart_of_accounts/charts/account_properties.py
erpnext/hooks.py
erpnext/patches.txt
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
erpnext/stock/get_item_details.py
erpnext/translations/ar.csv
erpnext/translations/bs.csv
erpnext/translations/ca.csv
erpnext/translations/el.csv
erpnext/translations/es.csv
erpnext/translations/fr.csv
erpnext/translations/hr.csv
erpnext/translations/id.csv
erpnext/translations/is.csv
erpnext/translations/ja.csv
erpnext/translations/nl.csv
erpnext/translations/pl.csv
erpnext/translations/pt-BR.csv
erpnext/translations/ru.csv
erpnext/translations/tr.csv
erpnext/translations/zh-cn.csv
erpnext/translations/zh-tw.csv
setup.py
2015-02-24 18:12:17 +05:30
Nabin Hait
93b3a37a3b
rounding issue and rate trigger
2015-02-24 17:08:51 +05:30
Nabin Hait
903c42a130
multiplefixes
2015-02-24 15:24:49 +05:30
Anand Doshi
d57e793bf3
[fix] Added unicode_literals if missing in py files
2015-02-24 12:24:53 +05:30
Nabin Hait
7b19b9ed02
minor fixes
2015-02-24 10:04:00 +05:30
Nabin Hait
82e3e25cdb
fixes for base_rate, base_amount, tax_amount: mass search and replace
2015-02-24 10:02:28 +05:30
Nabin Hait
37b047d9a8
Fields added in all sales and purchase doctypes
2015-02-24 10:02:28 +05:30
Nabin Hait
613d081a60
Validate taxes and charges input, commonified
2015-02-24 10:02:28 +05:30
Nabin Hait
e9eec93be7
minor fix
2015-02-24 10:02:27 +05:30
Nabin Hait
f0bc9b6d3a
Renamed Net total to Total and dynamic label
2015-02-24 10:02:27 +05:30
Nabin Hait
de9c8a9028
discount calculation and in print view
2015-02-24 10:02:27 +05:30
Nabin Hait
2b019ed430
Fixes for discount amount
2015-02-24 10:02:27 +05:30
Nabin Hait
ce24512ed7
Commonified sales/purchase taxes and charges master.js code
2015-02-24 10:02:27 +05:30
Nabin Hait
e7679703cf
Taxes and totals calculation in party currency
2015-02-24 10:02:27 +05:30
Anand Doshi
f9fc04ce8e
Website Listing
2015-02-23 22:34:27 +05:30
Rushabh Mehta
93b2f167f8
[fixes] opportunity, task minor
2015-02-23 14:43:16 +05:30
Rushabh Mehta
d54031f3b5
[tests] [projects] merged tasks and projects and added quick edit of tasks from projects
2015-02-22 22:32:39 +05:30
Rushabh Mehta
813f0eda05
[form] section labels
2015-02-20 16:02:48 +05:30
Rushabh Mehta
dc93e0adc6
[fixes] stock reco
2015-02-20 15:11:56 +05:30
Rushabh Mehta
50dc4e90e3
[cleanup] item grid views, removed desc etc
2015-02-19 20:05:45 +05:30
Rushabh Mehta
c7a11cc451
[usability] [fixes] stock entry and production order
2015-02-19 16:28:35 +05:30
Rushabh Mehta
d60acb9f26
[fixes] production, added qty transferred, fix gantt, fiscal year (set fiscal year, instead of validation
2015-02-19 14:53:31 +05:30
Nabin Hait
3fa7cc524b
Update sales_order_item.json
2015-02-18 21:11:45 +05:30
Rushabh Mehta
614e7ab757
[cleanup] SMS, and added item filter in stock balance
2015-02-18 19:51:48 +05:30
Neil Trini Lasrado
d8b35639d8
image feild made hidden
2015-02-18 12:33:53 +05:30
Neil Trini Lasrado
c48f06c095
Image field and view added to all selling doctypes
2015-02-18 12:33:19 +05:30
Neil Trini Lasrado
66df3566a9
html item desc removed from item master, item image added in oppurtunity
2015-02-18 12:32:37 +05:30
Nabin Hait
fe81da2dd1
listview indicator fix
2015-02-18 12:23:18 +05:30
Nabin Hait
da5f766dd5
fixed conflict
2015-02-18 11:55:13 +05:30
Anand Doshi
8c0f05fbae
[minor] grid report loading
2015-02-17 19:53:23 +05:30
Nabin Hait
bd00e81ad5
Commonified taxes and totals calculation in server side
2015-02-17 12:50:51 +05:30
Nabin Hait
6f0a3ed8d4
fixed conflict
2015-02-17 11:12:04 +05:30
Rushabh Mehta
60cfccbf77
[new-module] crm
2015-02-17 10:36:54 +05:30
Nabin Hait
188f69a713
commonified totals calculation in js
2015-02-12 17:55:50 +05:30
Nabin Hait
5690be103c
Replaced renamed total fields in code files
2015-02-12 16:09:11 +05:30
Nabin Hait
461ee2ebae
Renamed total fields
2015-02-12 11:47:45 +05:30
Nabin Hait
7945712171
Merge branch 'v5.0' of https://github.com/frappe/erpnext into foreign_currency_calc
2015-02-11 12:55:10 +05:30
Nabin Hait
8fa503e177
Fixed conflict while merging v4 into v5
2015-02-10 16:44:00 +05:30
Nabin Hait
15cd12214e
Fixed conflict while merging v4 into v5
2015-02-10 16:37:18 +05:30
Anand Doshi
6dfd430a2f
Moved flags like ignore_mandatory, ignore_validate etc to doc.flags
2015-02-10 14:41:27 +05:30
Neil Trini Lasrado
47a62c623c
fixes for #2655
2015-02-06 15:51:20 +05:30
Anand Doshi
9b30a8626c
[minor] removed default filters for sales order and material request, fixed pos css
2015-02-06 12:30:08 +05:30
Nabin Hait
5e13e0c316
net_total and grand_total mismatch issue
2015-02-05 17:18:03 +05:30
Rushabh Mehta
a232c80d77
[share] add share permission
2015-02-05 15:52:58 +05:30
Rushabh Mehta
0e13221338
[print] item tables - override description and uom
2015-02-04 17:02:24 +05:30
Nabin Hait
d2b762d760
Merge pull request #2617 from neilLasrado/sales-order
...
sales order - allow same item to enter multiple times. Throws warning
2015-02-02 16:44:12 +05:30
Neil Trini Lasrado
809abdf295
lead report - state, country and pincode seprated from address
2015-02-02 11:43:56 +05:30
Rushabh Mehta
052bd624c1
[minor] removed company description and don't call apply_price_list if no items
2015-01-30 16:57:24 +05:30
Rushabh Mehta
06fa46fafe
[fix] onshow > on_page_show
2015-01-29 18:09:11 +05:30
Nabin Hait
22a4b82bd2
Minor fixes
2015-01-28 13:11:49 +05:30
Anand Doshi
8147f74e4e
[minor] Mandatory filters in Customer Acquisition and Loyalty
2015-01-27 13:16:18 +05:30
Nabin Hait
d41f3c1f5e
All the calculations in taxes_and_totals file
2015-01-23 16:24:49 +05:30
Rushabh Mehta
5bceebc6a1
[fix] fixes birthday reminders #2021
2015-01-23 15:22:30 +05:30
Nabin Hait
b4a3dfa893
All the calculations in taxes_and_totals file
2015-01-22 17:13:13 +05:30
Nabin Hait
963393409e
minor fix: child table length
2015-01-21 17:22:11 +05:30
Neil Trini Lasrado
f108c2df72
sales order - allow same item to enter multiple times. Throws warning
2015-01-21 14:33:49 +05:30
Nabin Hait
ea61046e8d
Updated Quotation Status
2015-01-21 14:08:06 +05:30
Rushabh Mehta
81e972eac4
[cleanups]
2015-01-19 17:34:54 +05:30
Nabin Hait
dd4617d30f
Opportunity From field is mandatory
2015-01-16 15:08:00 +05:30
Nabin Hait
239c2c327c
Hide currency and price list section after submission
2015-01-15 14:22:04 +05:30
Nabin Hait
fff3ab752c
Fixed conflict
2015-01-14 16:27:13 +05:30
Nabin Hait
2244ac4d52
Discount amount in party currency
2015-01-12 17:35:37 +05:30
Nabin Hait
e8500ad4e6
Multiple fixes
2015-01-10 16:05:17 +05:30
Rushabh Mehta
d49a123fd0
[ui] listviews
2015-01-07 16:43:47 +05:30
Neil Trini Lasrado
a17d7cea34
test records fixed
2015-01-07 15:42:59 +05:30
Rushabh Mehta
738d4ef5c8
[ui] [listviews] indicators
2015-01-06 18:09:02 +05:30
Anand Doshi
50d7e8cf8f
[design] Point of Sale
2015-01-06 17:14:26 +05:30
Rushabh Mehta
e1cb0ae738
[design] list views
2015-01-05 17:39:05 +05:30
Nabin Hait
5515b1ea7f
minor fix
2015-01-05 08:18:15 +05:30
Nabin Hait
8a00319962
minor fix
2015-01-04 17:27:40 +05:30
Anand Doshi
3f5e95a99e
[design] Fixed Grid Reports
2015-01-01 16:26:18 +05:30
Rushabh Mehta
4c36d7388c
[ux] fixed creation via tree views for Item Group etc
2015-01-01 15:59:34 +05:30
Rushabh Mehta
bfaf0a8f43
[tree] [ui]
2015-01-01 12:49:18 +05:30
Rushabh Mehta
419ae33c3e
[merge] v5-design
2014-12-31 15:03:14 +05:30
Nabin Hait
54361e8651
fixed conflict while merging develop into v5
2014-12-31 13:24:36 +05:30
Nabin Hait
dd38a266b8
Removed tname and fname from code
2014-12-26 13:15:21 +05:30
Rushabh Mehta
4096a3ab2b
[design] form toolbar
2014-12-26 12:53:02 +05:30
Rushabh Mehta
a9ba5eff99
[design] pos
2014-12-26 12:52:11 +05:30
Rushabh Mehta
f870527e7c
[design] wip
2014-12-26 12:52:11 +05:30
Nabin Hait
4b8185db19
renaming: entries
2014-12-25 18:19:39 +05:30
Nabin Hait
23d2a53017
Code replacement for journal voucher renaming
2014-12-25 17:14:18 +05:30
Nabin Hait
e7d153624f
Table Field Renaming: code replace, JV and budget distribution renamed
2014-12-25 16:01:55 +05:30
Nabin Hait
d8f4984d71
Table fieldnames renaming: updated json and patch
2014-12-24 17:04:48 +05:30
Nabin Hait
cb11f27558
Customer should not copied from lead to opoortunity
2014-12-19 10:51:59 +05:30
Nabin Hait
0f2137be18
no copy property for customer's po no
2014-12-16 10:37:55 +05:30
Nabin Hait
ad0bd4ca92
Pull all customer's po no in delivery note when made from multiple sales order
2014-12-12 12:49:45 +05:30
Nabin Hait
5cc0531d27
Merge pull request #2451 from revant/develop
...
"From time" cannot be later than "To time" and hours cannot be negative
2014-12-02 14:27:00 +05:30
Revant Nandgaonkar
d0a44ca85c
Changed contact_date to Datetime so appointment or call with time can be scheduled
2014-12-01 23:31:53 +05:30
Nabin Hait
1b5afe737f
Fixes in authorization rule based on average discount
2014-11-28 16:59:32 +05:30
Rushabh Mehta
6d950d23a8
[merge]
2014-11-28 12:08:51 +05:30
Rushabh Mehta
bd9b62ff28
[rename] Support Ticket -> Issue
2014-11-28 11:46:10 +05:30
Nabin Hait
249bbbc56f
fixes during testing version 5
2014-11-26 15:35:39 +05:30
Nabin Hait
b74ae7aa31
Minor fix for order to invoice mapping
2014-11-24 18:17:01 +05:30
Rushabh Mehta
2f4567fa3c
[minor] [ux] address refresh for lead
2014-11-24 15:18:40 +05:30
Rushabh Mehta
7d36875d6f
[refactor] address and contact list in customer, supplier, lead, sales person
2014-11-24 14:16:47 +05:30
Nabin Hait
ccd9fd3e94
Rounding in totals calculation
2014-11-14 14:27:24 +05:30
Nabin Hait
ae1dcabcb5
Fixed merge conflict
2014-11-05 12:41:02 +05:30
Neil Trini Lasrado
6fc2821e5f
fix - validations added for auto fetch of cost center
2014-10-28 14:36:26 +05:30
Nabin Hait
10b155a486
cost center based on project
2014-10-23 13:18:59 +05:30
Rushabh Mehta
be1a8d82c5
[merge] develop
2014-10-21 13:14:55 +05:30
Nabin Hait
73804580d4
validate quotation to lead or customer
2014-10-20 11:18:11 +05:30
Nabin Hait
30a0e3e8b4
Merge pull request #2275 from ankitjavalkarwork/fix2164
...
Add Delivery Qty to Sales Invoice From Delivery Note, Misc fixes
2014-10-10 18:05:19 +05:30
ankitjavalkarwork
ad3d698fd8
[ #2164 ] Add test case for delivered qty in Sales Order
2014-10-10 16:59:47 +05:30
ankitjavalkarwork
e69a611991
[ #2164 ] New field names in DN, fix field name refs, Patch added
2014-10-09 17:31:46 +05:30
Neil Trini Lasrado
eaae58f507
Transaction.js fixed , code commonified
2014-10-09 15:01:13 +05:30
Neil Trini Lasrado
9614b552fd
fiscal year auto-fetch added to c-form, installation_note, stock_reconciliation, customer_issue, maintanence_visit & removed for Expense Claim
2014-10-09 15:01:12 +05:30
Neil Trini Lasrado
565d986198
fiscal year auto fetch added to oppurtunity, quotation, material request, supplier quotation, expense claim doctypes + issues fixed
2014-10-09 15:01:12 +05:30
Neil Trini Lasrado
e6b14a4bf6
Fixed issues
2014-10-09 15:01:12 +05:30
ankitjavalkarwork
e93b1fc508
[fix][ #1450 ] Add Shipping Addr field to Sales Invoice
2014-10-09 12:11:49 +05:30
ankitjavalkarwork
1b2944e871
Rearrange To/From, Recurring Type field for better UX
2014-10-08 14:24:58 +05:30
ankitjavalkarwork
fe7a6b502a
Add Customer Credit Balance Report, minor changes
2014-10-07 11:41:31 +05:30
Nabin Hait
f065b756e5
Update customer.json
2014-10-06 17:50:58 +05:30
Nabin Hait
997a7a1d3e
Test case fixes
2014-10-06 13:15:21 +05:30
Nabin Hait
db030d1761
Set Receivable/Payable account based on party
2014-10-06 13:13:27 +05:30
Nabin Hait
e2095c0dd7
Created new doctype Party Account to maintain default party account, it is a child table for Customer, Supplier, Customer Group, Supplier type
...
Default Receivable / Payable Account in company
Filter results in all receivable/payable link fields
2014-10-06 13:12:05 +05:30
Nabin Hait
3a40435f8c
Credit days and credit limit option in customer group / supplier type #1354
2014-10-06 13:05:28 +05:30
Nabin Hait
e9daefe07f
Credit Limit and credit days fixes #2031
2014-10-06 13:05:28 +05:30
Nabin Hait
be8ec39678
Deleted master_type, master_name, credit_days, credit_limit fields from account
...
Warehouse account is linked via Warehouse field now, instead of master_name field
patch to copy warehouse value from master_name to warehouse
party_type and party field added in GL Entry and Journal Voucher Detail
2014-10-06 13:02:40 +05:30
ankitjavalkarwork
9e5f319d80
[ #2253 ] Rearrange To/From fields and depend on is_recurring in SI,SO,PI,PO
2014-10-06 12:58:38 +05:30
Nabin Hait
c68646c694
[merge] 4.x to 5.0
2014-10-06 12:57:48 +05:30
Stefan Siegel
76a8c75592
Fix opportunities not showing in "Linked With" dialog
2014-10-03 13:25:42 +02:00
Anand Doshi
1394509343
Fixes for recurring document
2014-09-21 19:45:49 +05:30
Anand Doshi
8370cb3e71
Merge branch 'develop' of https://github.com/sbkolate/erpnext into sbkolate-develop
2014-09-18 12:06:05 +05:30
Rushabh Mehta
5cdc8e560c
[mailbox] removed separate email settings for jobs, sales, support
2014-09-16 15:12:18 +05:30
Rushabh Mehta
e10cf021d9
[email] remove communicationlist #561
2014-09-16 15:12:18 +05:30
Rushabh Mehta
ce00772ac0
[cleanup] removed communication js, fields
2014-09-16 15:11:42 +05:30
Rushabh Mehta
c0bb453b88
[refactor] [frappe 5.0]
2014-09-16 15:10:54 +05:30
Rushabh Mehta
ed37cef32a
[refactor modules]
2014-09-16 15:08:02 +05:30
Nabin Hait
c25681c36c
Added item group and brand in sales-person-wise transaction summary report
2014-09-16 12:28:40 +05:30
Sambhaji Kolate
930e7f5578
fix conflict
2014-09-15 12:43:48 +05:30
81552433qqcom
951da0ca3d
added translations to report py file.
2014-09-12 16:07:12 +05:30
81552433qqcom
351be9ca42
translations.
2014-09-12 16:07:11 +05:30
81552433qqcom
4bab0a2f54
various translation missed __()
2014-09-12 16:07:11 +05:30
Anand Doshi
61a591944b
[minor] ui/ux fixes in Payment Tool
2014-09-12 15:42:16 +05:30
Ankit Javalkar
8e7ca41817
Payment Tool #2106
2014-09-12 15:23:46 +05:30
Anand Doshi
2f9c36a588
Merge pull request #2175 from ankitjavalkarwork/fix2153
...
[minor] Add Permission for additional roles to Customer, Supplier
2014-09-11 16:47:08 +05:30
Sambhaji Kolate
b14401c320
change convert_to_recurring() to take recurring_id dynamicaly
2014-09-11 16:09:05 +05:30
ankitjavalkarwork
5e34383e25
[minor] Add Permission for additional roles to Customer, Supplier
2014-09-10 17:54:42 +05:30
Anand Doshi
fc33d5a75b
Set allow_on_submit for 'page_break', 'letter_head', 'select_print_heading', 'print_heading'. Fixes frappe/erpnext#1810
2014-09-09 15:25:43 +05:30
Anand Doshi
45c9b1c065
[minor] Set in_list_view for Sales and Purchase item tables
2014-09-08 17:42:17 +05:30
ankitjavalkarwork
aaac7c17b8
Fix minor errors, fix patch, call in hooks, move from account_controller to recurring_document
2014-09-01 16:22:56 +05:30
ankitjavalkarwork
e60822b094
Add tests for Recurring Document, Sales Inv, Sales Order, fix minor errors
2014-09-01 16:20:59 +05:30
ankitjavalkarwork
e8331d40f3
Commonify Recurring Sales Order/Invoice
2014-09-01 16:20:59 +05:30
Anand Doshi
98ff85dea1
Merge pull request #2108 from neilLasrado/fix-issue-448
...
[Fix] Issue #448
2014-08-29 15:46:13 +05:30
Anand Doshi
37cb544839
[fix] default quotation list filter
2014-08-28 11:27:18 +05:30
Neil Trini Lasrado
d6d71e8078
[fix] issue 448 final 1
2014-08-27 18:48:57 +05:30
Anand Doshi
43f087c99d
[hotfix] Supplier read permission for Purchase User
...
[Fix] Issue #448
[Fix] Issue #448 2
2014-08-26 16:30:39 +05:30
Rushabh Mehta
e8dd4160d4
[cleanup] remove allow_attach
2014-08-25 13:04:21 +05:30
Nabin Hait
f4ad37d208
Reset receiver list always on create receiver list button
2014-08-22 12:42:57 +05:30
Rushabh Mehta
cb067aa579
[route] refactor, wip
2014-08-20 11:44:30 +05:30
Anand Doshi
f72de95a38
[fix] SMS Center
2014-08-18 19:51:47 +05:30
Anand Doshi
eb39435481
[hotfix] Allow on submit for Projected Qty
2014-08-14 18:08:19 +05:30
Rushabh Mehta
ab8bde0149
[ux] added folds, show actual / projected qty in pos
2014-08-14 11:43:46 +05:30
Anand Doshi
f0075b9ce2
[fix] Opportunity communication listing
2014-08-12 15:20:39 +05:30
Anand Doshi
42335fb2cb
[minor] Allow on Submit - Actual / Projected Qty
2014-08-11 13:28:29 +05:30
Anand Doshi
5d64f5abd4
[hotfix] Sales Order list
2014-08-09 14:54:52 +05:30
Anand Doshi
03eadb74ab
Fixes to microtemplate feature
2014-08-08 11:56:32 +05:30
Rushabh Mehta
c9bd3f5d4a
added templates for projects
2014-08-08 11:56:32 +05:30
Rushabh Mehta
873141c1a5
more updates to lists and started sane filters
2014-08-08 11:56:32 +05:30
Rushabh Mehta
18eb4f5015
added listviews for sales, purchase
2014-08-08 11:56:31 +05:30
Rushabh Mehta
67af99794d
start custom list rendering for Sales Order
2014-08-08 11:56:31 +05:30
Rushabh Mehta
b5e768906a
built item grids for sales, purchase, stock
2014-08-08 11:56:31 +05:30
Rushabh Mehta
995185d02d
[ux] fixed primary action
2014-08-08 11:51:23 +05:30
Anand Doshi
959bd6e9e7
[test] Block Delivery Note if it is linked to a cancelled Sales Order
2014-08-05 14:25:40 +05:30
Nabin Hait
1279f1d430
Fixes for customer / supplier renaming
2014-08-04 13:05:59 +05:30
Anand Doshi
29817d6d8b
[print] Moved Total Taxes and Charges to the right column
2014-07-31 16:05:19 +05:30
Anand Doshi
fbe37c9158
Labels: Use Date instead of Posting Date
2014-07-31 14:31:25 +05:30
Anand Doshi
627f13ea26
Changed fieldtype of 'contact_email', 'contact_mobile' to Small Text
2014-07-30 13:09:01 +05:30
Anand Doshi
bc708ee4c2
[print] Disable rounded total
2014-07-29 22:24:31 +05:30
Anand Doshi
9c018fe984
[minor] Fixed address listing
2014-07-28 12:59:52 +05:30
Anand Doshi
a5437cdac1
Fixes for print
2014-07-25 13:02:28 +05:30
Rushabh Mehta
5b51cc86a9
many fixes to print
2014-07-25 13:01:53 +05:30
Rushabh Mehta
f84c240d1c
cleanup for print format
2014-07-25 13:01:52 +05:30
Rushabh Mehta
28804bfb62
started sales order print format (new style)
2014-07-25 13:01:52 +05:30
Anand Doshi
e8c5cb8c9a
Fixed Address and Contact report name
2014-07-14 13:10:24 +05:30
nabinhait
d5fb5d91e9
overflow validation fixed
2014-07-10 15:27:27 +05:30
Anand Doshi
a96cf5b96b
Print Hide other charges calculation
2014-07-10 12:16:39 +05:30
nabinhait
8e4fcca216
Get query fixes in address in contact listing. Fixes #1911
2014-07-09 12:50:50 +05:30
nabinhait
ff2cc1626e
Merge branch 'reapply-price-list' of github.com:anandpdoshi/erpnext into anandpdoshi-reapply-price-list
2014-07-08 15:30:25 +05:30
Anand Doshi
cf6d31cefc
Sales Order: Fixed test case
2014-07-07 18:46:02 +05:30
nabinhait
2c0c66e756
Update delivery and billing status in SO
2014-07-07 17:56:25 +05:30
Rushabh Mehta
58692fe4d1
sales order status bugfix, add leading / in website_image and removed send_print_in_body_and_attachment
2014-07-07 12:29:43 +05:30
Anand Doshi
dffec8fb85
Reapply Price List on Change
2014-07-04 15:44:48 +05:30
Rushabh Mehta
501b2cc617
duplicate name fix for customer
2014-07-02 18:01:30 +05:30
Anand Doshi
c33ae0c7df
Minor fix: commonified message.
2014-07-01 16:27:24 +05:30
Anand Doshi
da8adea0a9
Fixed customer test
2014-06-30 17:28:52 +05:30
Anand Doshi
0e72a87613
Improved test_rename: check if comments are also moved on rename
2014-06-30 17:05:51 +05:30
Anand Doshi
11ada53ed5
Fixes related to Website Route system and other misc fixes
2014-06-28 12:13:11 +05:30
Anand Doshi
e0a7ff77df
Merge pull request #1838 from nabinhait/v4-hotfix
...
Multiple fixes
2014-06-24 17:37:39 +05:30
Nabin Hait
60c48fee16
minor fixes
2014-06-24 17:34:52 +05:30
Nabin Hait
0b15755441
Cost center-wise net profit in financial analytics report
2014-06-24 17:02:45 +05:30
Anand Doshi
83da92fdcc
Naming Series Property Setter Patch
2014-06-23 18:04:07 +05:30
Nabin Hait
e84f8b23aa
minor fix in sales invoice
2014-06-23 15:36:30 +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
d768afb80b
Fixed Sales Order -> Delivery Note mapping of address fields
2014-06-18 15:23:25 +05:30
Nabin Hait
ac1a4ed576
Field renamed in sms center
2014-06-18 10:20:01 +05:30
Nabin Hait
b73d3f925d
Do not make packing list after submission
2014-06-18 10:18:50 +05:30
Rushabh Mehta
69641ddc36
Update sms_center.json
...
changed total words to total characters
2014-06-18 09:04:09 +05:30
Anand Doshi
205438669a
Removed clear_custom_buttons, pos view switch fix
2014-06-12 15:00:51 +05:30
Rushabh Mehta
880b3ef6c0
added qty updating option multi-item selector
2014-06-06 11:45:30 +05:30
Rushabh Mehta
ba83e9cfbe
removed sms control and related cleanup, fixes frappe/erpnext#462
2014-06-05 17:56:42 +05:30
Rushabh Mehta
c02fbd22fa
removed address_title from address and removed test
2014-06-05 16:16:13 +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
4985691617
Role and User Permissions
2014-06-04 17:48:54 +05:30
Anand Doshi
69eec9e344
Role and User Permissions
2014-06-04 17:48:54 +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
b15764ef2c
Translation issue fixed in analytics/grid report
2014-06-03 13:02:39 +05:30
Anand Doshi
be99b1240c
Merge pull request #1722 from nabinhait/v4-hotfix
...
multiple fixes
2014-06-02 11:09:32 +05:30
Rushabh Mehta
cc37cc83cd
removed section_style
2014-05-31 10:36:41 +05:30
Nabin Hait
0984f227a8
minor fixes related to path
2014-05-30 19:10:12 +05:30
Nabin Hait
8de61559b0
Minor fixes in sales / purchase analytics. Fixes #1701
2014-05-30 11:22:11 +05:30
Nabin Hait
a3dd72a759
Pricing Rule
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
a39cae9c2e
added title field to support ticket, lead and employee
2014-05-21 17:34:22 +05:30
Nabin Hait
956d7868b5
removed print statement
2014-05-20 10:36:14 +05:30
Nabin Hait
2e0620e370
Server side onload functionality in multiple docs
2014-05-19 18:15:58 +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
Anand Doshi
78e9c6ef70
Deprecate Select fields with options as link:
2014-05-09 13:36:13 +05:30
Nabin Hait
e37b8e6682
fixed conflict
2014-05-07 19:20:56 +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
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
Anand Doshi
d9f0f27cd4
Fixes in test cases
2014-04-30 22:16:25 +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
Nabin Hait
6777efa7fa
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-04-28 17:09:13 +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
e3f6b6d899
Fixed Opportunity Lost UX
2014-04-25 18:36:06 +05:30
Anand Doshi
8bde7f9b3a
Conditionally toggle Naming Series. Fixes #1526
2014-04-24 18:11:49 +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
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
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
Anand Doshi
ac32bad25a
Fixes in Taxes, Quotation and Address Territory
2014-04-18 01:32:02 +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
Rushabh Mehta
ff93802d58
more message fixes
2014-04-15 18:40:31 +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
e1eeb22f1e
remove linebreaks for translation strings (js)
2014-04-15 10:50:36 +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
Nabin Hait
088dec6c09
testcase fixes #478
2014-04-07 16:00:28 +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
Nabin Hait
365ae27acf
frappe/frappe#478 fixes
2014-04-03 17:38:54 +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
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
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
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
d6e4ab3fd4
maintenance schedule: validate amc dates and update in serial no
2014-03-26 10:23:27 +05:30
Nabin Hait
0c9d42258c
Minor fix related to pos paid amount
2014-03-25 19:35:41 +05:30
Nabin Hait
2c517e0a62
Fixes related to countrywise coa
2014-03-25 18:28:49 +05:30
Nabin Hait
73083dc960
Fix related to user_default
2014-03-21 11:26:08 +05:30
Nabin Hait
482ffac83f
Set paid amount to zero if not pos
2014-03-21 11:26:07 +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
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
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
73f0bf36c1
fixed #1454
2014-03-06 14:45:02 +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
2d5727b17b
Ignore mandatory during email pulling
2014-03-05 19:24:07 +05:30
Nabin Hait
2d57b0aa52
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-03-05 10:51:04 +05:30
Anand Doshi
64f2ccd9e1
Global Settings in Setup, Sales Master Manager can restrict for Customer
2014-03-03 19:28:30 +05:30
Anand Doshi
f5794f1c07
Module Home Pages using Module View
2014-03-03 15:06:34 +05:30
Nabin Hait
8e4640f464
minor fix in report
2014-03-03 12:06:50 +05:30
Nabin Hait
311079a311
Patch: copy customer discount to pricing rule
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
Anand Doshi
e9baaa68e7
Changed frappe.conn to frappe.db
2014-02-26 12:35:33 +05:30
Anand Doshi
4362443b6e
Propagate ignore_permissions during mapping from quotation to sales order
2014-02-25 15:42:32 +05:30
Anand Doshi
201dbbd977
Quotation Item Table can be empty
2014-02-25 15:42:32 +05:30
Nabin Hait
22831563ff
default value in selling settings
2014-02-19 18:35:54 +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
Rushabh Mehta
793ba6bd37
-webnotes +frappe 💥
2014-02-14 15:47:51 +05:30
Nabin Hait
9ea461638e
minor fix
2014-02-14 13:40:41 +05:30
Nabin Hait
66b2717c54
Merge pull request #1414 from akhileshdarjee/4.0-hotfix
...
Customer and Supplier dashboard set to company currency
2014-02-12 16:55:17 +05:30
Nabin Hait
139dc7b9b2
minor fixes
2014-02-12 14:54:16 +05:30
Nabin Hait
0aa71a5c41
minor fixes
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
Akhilesh Darjee
f2b7cd65a9
customer and supplier dashboard set to company currency
2014-02-12 11:29:08 +05:30
Anand Doshi
d7cc47e3ac
Do not validate Material Request against Sales Order, Moved Setup page to Framework
2014-02-10 17:39:12 +05:30
Nabin Hait
a03f654446
Merge pull request #1382 from akhileshdarjee/4.0-hotfix
...
Newsletter can also be sent to employees
2014-02-06 16:02:39 +05:30
Nabin Hait
574c7e7c63
item related cleanup
2014-02-06 15:51:01 +05:30
Akhilesh Darjee
462740f72b
sales funnel fix
2014-02-06 13:14:15 +05:30
Anand Doshi
3decf4dbc5
Fixes related website hierarchy
2014-02-06 12:50:35 +05:30
Akhilesh Darjee
81578d2e77
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0-hotfix
2014-02-03 17:48:46 +05:30
Akhilesh Darjee
8f674fe0fb
minor changes
2014-02-03 17:47:50 +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
Nabin Hait
23c28704d2
Field arrangement in child table
2014-02-03 14:36:59 +05:30
Nabin Hait
dfae0ea570
minor fix in patch
2014-01-31 17:25:09 +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
Akhilesh Darjee
4e3b601990
webnotes/erpnext#1188 sms center character count
2014-01-30 19:13:25 +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
b665d86292
patch to reload all sales and purchase doctypes and print formats
2014-01-29 17:40:34 +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
86894f3bbf
merge conflict fixed
2014-01-27 15:42:02 +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
Akhilesh Darjee
a4e0a1c061
minor changes
2014-01-24 19:57:52 +05:30
Rushabh Mehta
1cd96a136f
updates for restriction
2014-01-24 11:10:24 +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
Akhilesh Darjee
5c96b75a68
fixed maintenance schedule
2014-01-02 17:54:12 +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
Anand Doshi
9a4a13cb73
Moved Portal and Shopping Cart to Shopping Cart app, and some minor fixes
2013-12-31 17:38:21 +05:30
Akhilesh Darjee
829eda47a8
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into flat-discount
2013-12-30 12:31:07 +05:30
Akhilesh Darjee
d203aea7c2
[flat discount] flat discount implemented on sales cycle
2013-12-27 17:49:57 +05:30
Rushabh Mehta
c4a0ed63ef
Moved demo to separate app, moved patches folder
2013-12-27 17:30:24 +05:30
Rushabh Mehta
4ac68952e8
Moved patches and fixed method routing in pages
2013-12-27 13:43:40 +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
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
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
39bb8e2ed4
step 0: install
2013-12-11 15:32:14 +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
Anand Doshi
1fc9ae2230
Fixes and Validations for nested doctypes
2012-09-24 14:00:59 +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
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
Anand Doshi
4de55b6f6b
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-09-10 14:44:03 +05:30
Nabin Hait
eb9f6eda02
order type fix in quote/SO
2012-09-10 14:36:49 +05:30
Anand Doshi
e67bcc38b4
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-09-06 17:51:05 +05:30
Anand Doshi
f480dc9d2e
fix in opportunity to quotation fetch
2012-09-06 17:50:44 +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
b211a41547
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-08-31 13:39:58 +05:30
Anand Doshi
00d3c7c67d
open communication in dialog
2012-08-31 13:25:03 +05:30
Anand Doshi
62a3881837
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-08-30 18:17:20 +05:30
Nabin Hait
fff16c337d
fixes in over billing validation
2012-08-29 12:07:32 +05:30
Nabin Hait
9c043b2f51
Billed amount in SO and DN based on export amount and patch for it
2012-08-29 11:46:12 +05:30
Anand Doshi
998d39f71b
Merge branch 'master' of github.com:webnotes/erpnext into unicode
2012-08-24 12:17:33 +05:30
Anand Doshi
ba278000d7
edit / add nodes allowed in sales browser, only if user has valid permissions
2012-08-24 12:15:44 +05:30
Rushabh Mehta
24fabf3b73
cleaned up source from lead
2012-08-06 15:21:35 +05:30
Rushabh Mehta
f83159edbe
Merge branch 'unicode' of github.com:webnotes/erpnext into unicode
2012-08-06 10:17:38 +05:30
Rushabh Mehta
49dc5da0dc
refactor unicode changes and merge with master with refactored email
2012-08-03 16:02:24 +05:30
Rushabh Mehta
384b61749e
added 'blog_subscriber' and 'unsubscribed' fields
2012-08-03 14:09:32 +05:30
Rushabh Mehta
f0018b5e05
added unsubscribed fields in Lead and Contact and cleaned up sendmail function
2012-08-02 18:03:12 +05:30
Anand Doshi
cf546d547d
fix in quotation item's get query
2012-08-01 12:05:13 +05:30
Anand Doshi
96efd2ba9b
fix in quotation item's get query
2012-08-01 12:00:30 +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
e87482ac86
Fixed: Lead Lost Reason message
2012-07-26 12:48:26 +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
18b9eccdfa
packing list issue fixed
2012-07-18 13:31:08 +05:30
Nabin Hait
41c922d200
Merge branch 'master' of github.com:webnotes/erpnext
2012-07-18 13:19:32 +05:30
Nabin Hait
510eda353a
packing list issue fixed
2012-07-18 13:19:01 +05:30
Nabin Hait
8b091cd864
Merge branch 'dev' of github.com:webnotes/erpnext into dev
2012-07-16 16:35:10 +05:30
Nabin Hait
a25ebe3dbf
Conversion rate fieldtype set as float (from currency)
2012-07-16 16:34:28 +05:30
Anand Doshi
2f192a6167
Merge branch 'dev' of github.com:webnotes/erpnext into dev
2012-07-16 16:33:22 +05:30
Anand Doshi
8499773db8
fix in last sales and quote rate in quotation
2012-07-16 16:33:10 +05:30
Rushabh Mehta
527c5b6da5
Merge branch 'dev' of github.com:webnotes/erpnext into dev
2012-07-16 15:45:18 +05:30
Rushabh Mehta
3c419c5e05
cur_frm.doc re-reference when is called
2012-07-16 15:44:38 +05:30
Nabin Hait
65535da220
Merge branch 'dev' of github.com:webnotes/erpnext into dev
2012-07-16 15:38:41 +05:30
Nabin Hait
49e170153e
Include in print rate validation added
2012-07-16 15:38:11 +05:30
Anand Doshi
e7c54a4714
Merge branch 'dev' of github.com:webnotes/erpnext into dev
2012-07-16 15:16:27 +05:30
Anand Doshi
7f2385cee9
Merge branch 'master' into dev
2012-07-16 15:15:34 +05:30
Anand Doshi
59fa430be3
fixes in quotation item code get query
2012-07-16 15:15:24 +05:30
Rushabh Mehta
9e9809a44f
Merge branch 'dev' of github.com:webnotes/erpnext into dev
2012-07-16 14:17:22 +05:30
Rushabh Mehta
2eef40bf1e
get_field > wn.meta.get_docfield
2012-07-16 14:16:57 +05:30
Nabin Hait
8f5cd388cc
Merge branch 'dev' of github.com:webnotes/erpnext into dev
2012-07-16 12:50:25 +05:30
Nabin Hait
388e09834c
Check duplicate SO entry for same po no and customer
2012-07-16 12:49:52 +05:30
Anand Doshi
bb81c198f5
Merge branch 'dev' of github.com:webnotes/erpnext into dev
...
Conflicts:
public/js/all-app.js
public/js/all-web.js
2012-07-13 16:48:08 +05:30
Anand Doshi
9ec8024db7
show order type icon in sales order list view
2012-07-13 16:46:12 +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
cf969143f2
cleaned up customer group
2012-07-12 09:54:43 +05:30
Rushabh Mehta
b9fabf8e16
sales bom cleanup
2012-07-11 19:18:50 +05:30
Nabin Hait
cfc6bb1d6c
consider warehouse, serial no and batch no from packing list for sales bom item and populate packing list only for sales bom items
2012-07-11 13:14:52 +05:30
Nabin Hait
0a38e4528b
Merge branch 'master' of github.com:webnotes/erpnext
2012-07-10 10:28:21 +05:30
Nabin Hait
1b310c26ce
removed depricated commenting style
2012-07-10 10:27:58 +05:30
Anand Doshi
95a822c701
Fetch Customer's Item Code in Sales Transaction
2012-07-09 11:09:07 +05:30
Nabin Hait
cb2e76a79c
delete row issue in grid fixed
2012-07-05 14:44:39 +05:30
Anand Doshi
d383e573fc
contact, address list views and allow their deletion from customer / supplier form
2012-07-02 19:45:35 +05:30
Anand Doshi
e301e8a6c1
Merge branch 'master' into dev
...
Conflicts:
erpnext/buying/doctype/quality_inspection/quality_inspection.py
2012-06-28 18:40:57 +05:30
Nabin Hait
2c2a17f138
pull available qty in so and DN in selection of item
2012-06-27 15:14:58 +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
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
a5e972dd89
reserved warehouse in so and delivery warehouse in dn can be different
2012-06-25 18:06:37 +05:30
Nabin Hait
318eab813c
delete customer account on deletion of customer record
2012-06-22 13:35:13 +05:30
Anand Doshi
2939a0ea65
fetch price list rates when creating quotation from opportunity
2012-06-21 11:20:37 +05:30
Anand Doshi
f8946b1e31
fix in buttons displayed - on change of status in lead form
2012-06-18 18:04:28 +05:30
Anand Doshi
7d1e8f218b
change date field for sales invoice in sales personwise transaction summary search criteria
2012-06-14 18:11:36 +05:30
Rushabh Mehta
4c56275d26
appframe is now heading
2012-06-14 11:05:09 +05:30
Anand Doshi
7deaff1979
fixed default tax fetch issue
2012-06-13 14:20:24 +05:30
Anand Doshi
0146ddcfc6
delete communication log for supplier and customer, on trash
2012-06-12 14:09:44 +05:30
Anand Doshi
89e2b3bda4
minor fix in lead's listview
2012-06-12 13:11:29 +05:30
Anand Doshi
3b6eda3b45
fix in listviews of lead, customer and supplier
2012-06-12 13:08:57 +05:30
Nabin Hait
be5e5059c3
Lead Organization field added in quotation
2012-06-08 16:15:08 +05:30
Nabin Hait
2e3579a4eb
Item Barcode implemented
2012-06-07 19:09:17 +05:30
Anand Doshi
dbb84a271e
Merge branch 'master' of github.com:webnotes/erpnext into comm_log
...
Conflicts:
erpnext/selling/doctype/lead/lead.js
erpnext/setup/doctype/contact_control/contact_control.js
2012-06-05 18:37:17 +05:30
Nabin Hait
e315aba130
expected delivery date mandatory only if order type is sales
2012-06-01 10:11:14 +05:30
Anand Doshi
a6708fb748
new doctype: communication
2012-05-31 14:53:55 +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
82695ddd90
fixes in transaction history of customer and supplier
2012-05-29 14:14:27 +05:30
Anand Doshi
2ac77beb50
fix in packing list issue
2012-05-29 11:29:52 +05:30
Anand Doshi
2ad2426610
fix in get other charges of sales_common.py
2012-05-28 16:05:54 +05:30
Anand Doshi
041cea763e
fix in stock ledger entry for items have sales bom
2012-05-25 17:49:37 +05:30
Anand Doshi
16cf4fa806
fix in get_item_list, which was causing negative stock error
2012-05-25 16:54:27 +05:30
Anand Doshi
fcbd2ad792
Merge branch 'master' of github.com:webnotes/erpnext
2012-05-23 18:27:29 +05:30
Anand Doshi
9da0bf6106
fix in customer address contact report
2012-05-23 18:27:05 +05:30
Nabin Hait
4aaaa8af7b
Merge branch 'master' of github.com:webnotes/erpnext
2012-05-23 16:22:41 +05:30
Nabin Hait
2b06b903a5
Merge branch 'shf_rename'
2012-05-23 16:22:24 +05:30
Nabin Hait
517eacf9e3
packing list code updated for duplicate items in item table
2012-05-23 16:21:39 +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
Anand Doshi
38830ddae1
removed console log in customer.js
2012-05-23 10:55:59 +05:30
Nabin Hait
611157447f
sms fix
2012-05-22 17:25:39 +05:30
Anand Doshi
e780f661a7
fix in transaction history
2012-05-22 17:04:33 +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
cba9c716f2
Remove all those parent items from packing details which are no longer present in main item table
2012-05-21 15:35:23 +05:30
Nabin Hait
fec3f783af
custom field included in docfield query
2012-05-21 14:40:25 +05:30
Anand Doshi
1aae261490
delete button in doclistview
2012-05-21 14:31:03 +05:30
Anand Doshi
df914991c4
Merge branch 'shf_rename'
2012-05-18 18:21:43 +05:30
Anand Doshi
bde13a655f
moved uom next to qty in quotation item
2012-05-18 18:21:29 +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
acd291a228
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-18 11:50:08 +05:30
Nabin Hait
c1f1702e22
so pending item patch
2012-05-18 11:43:10 +05:30
Anand Doshi
fc9145425d
Fixes in Print Formats - discount in description
2012-05-17 18:11:54 +05:30
Nabin Hait
7a13b238cb
fixes in sales order pending items report
2012-05-17 18:06:14 +05:30
Anand Doshi
c7e26873c0
Merge branch 'shf_rename'
2012-05-17 15:28:54 +05:30
Nabin Hait
8b2473cc40
report fixed: sales persons target variance (item group wise)
2012-05-17 12:47:48 +05:30
Anand Doshi
1bba28a723
Merge branch 'shf_rename'
...
Conflicts:
erpnext/patches/patch_list.py
2012-05-15 18:22:55 +05:30
Nabin Hait
ed02a85184
fixed issue
2012-05-15 12:15:19 +05:30
Rushabh Mehta
deeae62b18
merge js/css
2012-05-14 15:03:17 +05:30
Anand Doshi
4a3d3d75de
Merge branch 'shf_rename'
...
Conflicts:
erpnext/patches/patch_list.py
2012-05-14 12:53:29 +05:30
Rushabh Mehta
7483ae9573
fix in button disablity leading to double click
2012-05-11 16:23:41 +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
3fa25faca2
fixes after merge with cms
2012-05-10 15:15:43 +05:30
Anand Doshi
bf68e04d2f
Merge branch 'master' of github.com:webnotes/erpnext
...
Conflicts:
erpnext/patches/patch_list.py
2012-05-10 12:40:58 +05:30
Nabin Hait
08f4cb7f6a
stock reco fix in valuation and cancellation
2012-05-10 12:13:47 +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
7f82256394
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-05-09 15:27:03 +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
Anand Doshi
c241a476ab
moved shipping address in basic info section
2012-05-09 11:07:15 +05:30
Rushabh Mehta
458ca8eddb
cms fixes
2012-05-09 10:17:08 +05:30
Rushabh Mehta
a920943e43
new cms with public folder
2012-05-07 18:00:57 +05:30
Rushabh Mehta
252664e288
remove unsupported for google
2012-05-07 10:43:18 +05:30
Nabin Hait
7c60fc13b2
reports fixed: itemwise sales/delivery report
2012-05-03 18:22:32 +05:30
Nabin Hait
d8df7b5884
quotation fix
2012-05-03 17:49:45 +05:30
Nabin Hait
dc7ffe47b2
fixes in quotation
2012-05-03 14:55:21 +05:30
Nabin Hait
16b6386648
fixes in quotation
2012-05-03 14:41:35 +05:30
Nabin Hait
32826a8cf1
fixes in customerwise price list
2012-05-03 13:10:34 +05:30
Nabin Hait
ab96d12086
fixes in customerwise price list
2012-05-02 12:19:33 +05:30
Anand Doshi
98ae634c50
fixes in sales order item widths
2012-05-01 18:31:40 +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
2ade43a647
field arrangement in sales cycle
2012-05-01 11:37:13 +05:30
Rushabh Mehta
79a664b4dc
cleaned up lead, opportunity, jv
2012-04-30 16:12:03 +05:30
Nabin Hait
41cc32790f
Fixed issie in auto notification
2012-04-30 14:36:18 +05:30
Nabin Hait
50c799880a
Merge branch 'master' of github.com:webnotes/erpnext
2012-04-26 12:47:30 +05:30
Nabin Hait
663e971557
Make next document button hide/unhide
2012-04-24 11:39:54 +05:30
Nabin Hait
6ed865f89a
Fld label based on currency
2012-04-23 10:37:28 +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
Anand Doshi
b301251090
Store base currency on client side
2012-04-20 11:51:27 +05:30
Nabin Hait
239e79038f
Customer/customer group wise price list
2012-04-20 10:25:03 +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
Nabin Hait
6f89f1eb86
fixes in sales cycle
2012-04-16 14:44:47 +05:30
Nabin Hait
eb3bb01431
Update erpnext/selling/doctype/sales_order/sales_order.js
2012-04-16 13:41:06 +05:30
Nabin Hait
6c615d9527
Merge branch 'master' of github.com:webnotes/erpnext
2012-04-13 14:14:39 +05:30
Anand Doshi
7aafb7e19e
Purchase Requisition to Purchase Request
2012-04-13 11:52:17 +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
Anand Doshi
09e8c4cd2d
further fixes
2012-04-12 17:51:53 +05:30
Anand Doshi
5ed0b6971c
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
2012-04-11 17:51:12 +05:30
Anand Doshi
e68fe505b9
custom fields creation patch - not to be executed automatically
2012-04-11 17:49:21 +05:30
Nabin Hait
c594bbcae0
address html issue fixed
2012-04-11 17:14:45 +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
Anand Doshi
7e0479bc4c
cleanup of search criteria
2012-04-05 18:27:56 +05:30
Nabin Hait
9ba2e49468
Update erpnext/selling/doctype/sales_common/sales_common.js
2012-04-05 16:54:19 +05:30
Nabin Hait
758eed555c
Update erpnext/selling/doctype/sales_common/sales_common.js
2012-04-05 16:45:33 +05:30
Nabin Hait
f77c940fcf
fixed price list currency issue
2012-04-05 16:29:02 +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
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
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
779a365420
fix in print hide of amount in words
2012-03-28 18:31:26 +05:30
Anand Doshi
c9456c18dc
listviews
2012-03-28 17:48:30 +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
Anand Doshi
c009450ef0
fix in item addition - details fetching
2012-03-26 14:17:30 +05:30
Nabin Hait
e2fe5629f0
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-26 11:07:01 +05:30
Rushabh Mehta
9d0ea6a5f1
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-26 07:25:22 +02:00
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
Anand Doshi
134ca41db8
Merge branch 'sync_file_db' of github.com:webnotes/erpnext into sync_file_db
2012-03-23 12:45:05 +05:30
Anand Doshi
358304d216
fix in sales common regarding date formatting
2012-03-23 11:12:03 +05:30
Rushabh Mehta
1952f5b033
lead listview
2012-03-22 12:21:56 +05:30
Rushabh Mehta
6ac1d73731
lead listview
2012-03-22 12:10:49 +05:30
Rushabh Mehta
3f46696db2
removed slider ui
2012-03-22 11:37:08 +05:30
Nabin Hait
0ad2ef2111
sync with respect to file
2012-03-21 15:02:39 +05:30
Rushabh Mehta
a665c1f60d
stylefixes and listviews
2012-03-21 11:47:58 +05:30
Rushabh Mehta
437c1b512c
listview update and form fix
2012-03-20 18:45:28 +05:30
Nabin Hait
9ff92369ad
lead organization fld added in quotation for printing
2012-03-20 16:44:15 +05:30
Rushabh Mehta
9b1afe197d
cleanup of form, rename, route, added fonts
2012-03-20 14:37:44 +05:30
Nabin Hait
31e0eacb7a
Update erpnext/selling/doctype/sales_order/sales_order.js
2012-03-19 18:54:11 +05:30
Nabin Hait
fdab486720
Update erpnext/selling/doctype/sales_order/sales_order.js
2012-03-19 18:43:07 +05:30
Nabin Hait
422f7e99db
Update erpnext/selling/doctype/customer/customer.txt
2012-03-19 15:37:03 +05:30
Rushabh Mehta
7afaa8665d
major reworking of page navigation
2012-03-16 18:28:09 +05:30
Nabin Hait
deac31fd2d
Update erpnext/selling/doctype/sales_common/sales_common.py
2012-03-16 15:14:27 +05:30
Nabin Hait
15afe87984
cost center will be fetched from other charges master
2012-03-16 15:11:02 +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
052b7e4049
fixed list->new->onload hooks
2012-03-13 15:19:06 +05:30
Rushabh Mehta
b9878d01e1
style fixes
2012-03-12 16:12:09 +05:30
Rushabh Mehta
9f89e35ebe
search selector fix for link
2012-03-09 17:51:39 +05:30
Rushabh Mehta
519f70b384
new autosuggest, other fixes
2012-03-09 16:44:21 +05:30
Rushabh Mehta
9a1bdf7224
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
2012-03-07 18:20:33 +05:30
Rushabh Mehta
f81a64e57f
new listing and changed wn.widgets.listing to wn.ui.listing
2012-03-07 18:19:41 +05:30
Nabin Hait
928e89a359
validation added in enquire
2012-03-07 13:11:24 +05:30
Rushabh Mehta
15da133de9
removed
2012-03-06 18:41:11 +05:30
Rushabh Mehta
60871c3f54
merge, doclist2
2012-03-05 18:29:34 +05:30
Rushabh Mehta
b9004bd6d0
doclist2
2012-03-05 18:28:33 +05:30
Nabin Hait
cf9c4c45a5
export /import fld hide issue, discount issue
2012-03-05 15:21:35 +05:30
Nabin Hait
07e9ff3d30
Merge branch 'master' of github.com:webnotes/erpnext
2012-03-05 10:55:24 +05:30
Nabin Hait
9cee59cd05
field order changed
2012-03-05 10:54:54 +05:30
Anand Doshi
821cb64987
fix in delivery note detail double entry
2012-03-03 16:27:48 +05:30
Nabin Hait
40c514612b
price list rate hiding issue
2012-03-02 16:06:33 +05:30
Nabin Hait
7e6b62eafd
print hide issue
2012-03-02 15:12:52 +05:30
Nabin Hait
fae852eb78
print hide issue
2012-03-02 15:10:51 +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
Anand Doshi
e306a1f5e1
fix in sales and purchase common column hide
2012-03-01 19:25:33 +05:30
Nabin Hait
96639d76b2
fixed indentation issue for custom script
2012-03-01 18:11:27 +05:30
Nabin Hait
be0b090d27
voucher date removal issue fixed
2012-03-01 17:31:51 +05:30
Nabin Hait
6d517ff005
form cleanup: fixed callback issues
2012-03-01 10:57:23 +05:30
Nabin Hait
177ca8dbbd
Description changed
2012-03-01 10:54:34 +05:30
Nabin Hait
6c75cce4b9
fixed confilct
2012-02-28 11:46:43 +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
Rushabh Mehta
2886b95da0
added todo
2012-02-24 11:26:31 +05:30
Rushabh Mehta
3966f1dc5d
added license files
2012-02-23 12:35:32 +05:30
Rushabh Mehta
17773d0763
added docdiff and removed un-necessary files
2012-02-22 15:55:41 +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
085617ed12
merge latest
2012-02-21 17:31:04 +05:30
Rushabh Mehta
d025133b39
added module pages and other css updates
2012-02-21 17:26:50 +05:30
Nabin Hait
8e9b578c00
expected delivery date can be equal to po date, not before po date
2012-02-21 13:35:28 +05:30
Rushabh Mehta
09a897afe4
added selling-home
2012-02-20 18:30:52 +05:30
Nabin Hait
ab90ee04f5
callback issues and item default get most priority
2012-02-15 14:28:02 +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
82cfe4b28d
Merge branch 'stable' of github.com:webnotes/erpnext into stable
2012-02-13 15:30:24 +05:30
Anand Doshi
702f174265
call update item details in post render
2012-02-13 15:29:41 +05:30
Nabin Hait
043b0f26bd
Merge branch 'stable' of github.com:webnotes/erpnext
2012-02-13 12:26:45 +05:30
Nabin Hait
b0fd0b3615
Edited through patch
2012-02-13 11:34:36 +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
a629fa3f05
Merge branch 'stable' into latest
2012-02-07 18:02:42 +05:30
Anand Doshi
02035d071a
Fix in import docs containing utf-8 encoding
2012-02-07 17:57:40 +05:30
Anand Doshi
b65363aa46
Merge branch 'stable' into latest
2012-02-07 14:28:29 +05:30
Anand Doshi
188a499f45
Fix in default customer group fetch while converting lead to customer
2012-02-07 14:28:05 +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
0c9cde9f62
Merge branch 'stable' into latest
...
Conflicts:
version.num
2012-02-02 12:43:39 +05:30
Anand Doshi
354dd9b35a
Allow changing export_rate if discount=0, then calculate discount based on ref_rate and export_rate (valid for non inclusive pricing)
2012-02-02 12:42:14 +05:30
Anand Doshi
a9a5128402
Merge branch 'stable' into latest
...
Conflicts:
erpnext/stock/doctype/item/item.txt
index.html
version.num
2012-02-02 11:44:25 +05:30
Anand Doshi
75d30b803f
Packing Slip and its patches
2012-02-02 11:38:15 +05:30
Anand Doshi
6c95ccb8f5
Net total calculation fix
2012-01-30 14:28:31 +05:30
Rushabh Mehta
d6840b202a
added products + cleanups
2012-01-30 14:00:46 +05:30
Rushabh Mehta
3a751e8f82
added blog subscriber, unsubscribe
2012-01-27 18:00:14 +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
Anand Doshi
9a7ea9285e
Customer Address Contact report
2012-01-23 18:32:20 +05:30
Anand Doshi
a170418ed0
Fixes in floating point issues
2012-01-23 14:09:06 +05:30
Anand Doshi
da68ce8b84
Fix to other charges total
2012-01-20 15:02:41 +05:30
Anand Doshi
60c42d2e1c
Fix to other charges total
2012-01-20 14:44:14 +05:30
Anand Doshi
4c92390972
Fix to other charges total
2012-01-20 14:32:01 +05:30
Anand Doshi
10393b39d3
Other Charges total fixed to 2 decimals
2012-01-20 14:29:40 +05:30
Anand Doshi
ff54778418
Fix in sales_common
2012-01-20 13:20:21 +05:30
Anand Doshi
edb45c6ce5
Purchase Rcpt in Feed, Grand Total fixed to 2 decimals in sales_common.js
2012-01-19 17:12:17 +05:30
Anand Doshi
dc914276a9
Merge branch 'master' into latest
2012-01-16 17:39:33 +05:30
Anand Doshi
d487f782a4
Fix: change module name from material_management to stock in an import in installation_note
2012-01-16 17:38:19 +05:30
Anand Doshi
077416300e
Fix: floating point issue on submission of RV and creation of GL Entry
2012-01-16 16:02:47 +05:30
Anand Doshi
90f6e55c29
Changes in Inclusive Rate Taxes precision
2012-01-16 14:13:39 +05:30
Anand Doshi
610f9728ab
Removing ref_rate back calculation as it injects floating point issue
2012-01-13 17:43:22 +05:30
Anand Doshi
4badeecf36
Reverting toFixed issue for grand total
2012-01-13 15:45:58 +05:30
Anand Doshi
560883145c
Fix to floating point issue in grand total
2012-01-13 14:35:42 +05:30
Anand Doshi
265f3edb8f
On clicking Get Charges, also pull the field included_in_print_rate
2012-01-12 14:56:26 +05:30
Anand Doshi
58574acfbc
Fix: Bug in Actual Tax Rate due to inclusive rate
2012-01-11 13:39:06 +05:30
Anand Doshi
35041607be
Fix: when ref_rate is 0 and basic_rate is > 0, calc ref_rate
2012-01-11 11:21:58 +05:30
Anand Doshi
3a82dfd171
Rename Indent to Purchase Requisition
2012-01-10 16:56:11 +05:30
Anand Doshi
95c9d30cfd
Removed unnecessary console logs
2012-01-10 11:52:43 +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
Nabin Hait
d0a892ffe7
print hide price list flds
2011-12-22 19:04:49 +05:30
Nijil Y
2c19960996
account conflict
2011-12-21 13:30:09 +05:30
Nijil Y
0f9eaeaa3c
updation Merge branch 'master' of git://github.com/webnotes/erpnext
...
Conflicts:
erpnext/projects/doctype/ticket/ticket.py
2011-12-21 12:34:13 +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
a57732f71d
Removed custom field from doctype
2011-12-20 18:48:19 +05:30
Nijil Y
8dd861bda5
Auto Indent creation when stock reaches re-order level
2011-12-20 17:17:51 +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
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
Nabin Hait
7b095e97ad
Update erpnext/selling/doctype/quotation/quotation.py
2011-11-16 14:25:36 +05:30
Nabin Hait
efc2c327cf
Update erpnext/selling/doctype/quotation/quotation.py
2011-11-16 14:24:31 +05:30
Nabin Hait
4faf99424a
Modified validation for duplicate item
2011-11-16 14:20:45 +05:30
Nabin Hait
65a053abe6
Modified validation for duplicate item
2011-11-16 14:19:26 +05:30
Anand Doshi
e3559853bd
Added new Print Formats as part of repository
2011-11-16 13:18:45 +05:30
Nabin Hait
685564f71d
Resolved conflict after merging with master
2011-10-11 14:42:34 +05:30
Nabin Hait
61985ac5fa
get_query modified for item in quotation
2011-09-30 17:46:08 +05:30
Nabin Hait
73c4a4a154
removed make_feed() function
2011-09-16 11:24:54 +05:30
Rushabh Mehta
53ba83158c
fixes to startup
2011-09-15 15:06:23 +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
66ac2b018a
first cut for lazy loading framework
2011-09-05 18:43:09 +05:30