Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,400 Commits 3 Branches 0 Tags 1 GiB
75e0f0a153
Commit Graph

215 Commits

Author SHA1 Message Date
Anand Doshi
32a9dfd983 Merge branch 'sbkolate-develop' into develop 2014-09-22 13:19:24 +05:30
Anand Doshi
1394509343 Fixes for recurring document 2014-09-21 19:45:49 +05:30
Nabin Hait
7c831c3fe5 Get advance in sales/purchase invoice 2014-09-19 14:31:49 +05:30
Nabin Hait
48f5fa69f3 Fetch and validate advance entries in sales/purchase invoice 2014-09-18 15:04:11 +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
c0bb453b88 [refactor] [frappe 5.0] 2014-09-16 15:10:54 +05:30
Sambhaji Kolate
f37d4337a4 fix test for purchase order 2014-09-15 13:37:46 +05:30
Anand Doshi
01d171756b [fix] before_recurring, set due_date, ageing_date as None, fixed account due date validation 2014-09-15 12:50:37 +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
Ankit Javalkar
8e7ca41817 Payment Tool #2106 2014-09-12 15:23:46 +05:30
Sambhaji Kolate
b14401c320 change convert_to_recurring() to take recurring_id dynamicaly 2014-09-11 16:09:05 +05:30
Sambhaji Kolate
b2a3f2d386 some minor changes get fixed for PO/PI 2014-09-10 17:40:48 +05:30
Sambhaji Kolate
e3d2643f2b Changes for Recurring PO/PI 2014-09-10 13:07:59 +05:30
Nabin Hait
fa18e7c21f Merge pull request #2140 from nathando/patch-1 
get_item_list does not [item qty=0]
 2014-09-09 12:06:21 +05:30
Nabin Hait
91fb661d12 minor fixes 2014-09-05 14:56:24 +05:30
nathando
247e9ffc96 get_item_list does not [item qty=0] 
- By using `if not d.qty:` it totally limits the chance of creating an empty Delivery Note 
- Should be changed to `if d.qty is None` 

Use case for empty DN: 
- Open a Delivery Note and tight to a specific Sales Order first without knowing the real qty at this point.
- Using barcode scanner to receive Sales Order to this DN (multiple times).
 2014-09-03 15:03:31 +08:00
ankitjavalkarwork
737d8e4d9f fix minor issue and set default value send as pdf 2014-09-01 16:22:56 +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
ac085e0f59 Add manage_recurring_documents and path to hooks, fix minor issues 2014-09-01 16:20:59 +05:30
ankitjavalkarwork
e8331d40f3 Commonify Recurring Sales Order/Invoice 2014-09-01 16:20:59 +05:30
Nabin Hait
14b8af2e65 Rounding issue fixed for bom quantity 2014-08-29 11:50:58 +05:30
Anand Doshi
913c51b1f8 [fix] get future vouchers query 2014-08-27 22:09:15 +05:30
Nabin Hait
cabf9c5bee Minor fix in status updater 2014-08-21 16:44:32 +05:30
Nabin Hait
f71011aff0 Project query fixed 2014-08-21 11:34:31 +05:30
Rushabh Mehta
cb067aa579 [route] refactor, wip 2014-08-20 11:44:30 +05:30
Rushabh Mehta
354acf6fc9 Merge pull request #2076 from anandpdoshi/anand-august-19 
[fix] Error Reports
 2014-08-19 14:07:03 +05:30
Nabin Hait
0a35effe49 Precision issue in tax calculation 2014-08-19 13:22:19 +05:30
Anand Doshi
78b6366325 [fix] Error Reports 2014-08-19 12:20:48 +05:30
Nabin Hait
c41a9480b8 Credit limit fixes 2014-08-18 15:40:36 +05:30
Rushabh Mehta
ab8bde0149 [ux] added folds, show actual / projected qty in pos 2014-08-14 11:43:46 +05:30
nabinhait
cc0692d714 landed cost fix 2014-08-11 16:12:31 +05:30
nabinhait
87f2401c1e Landed Cost on_submit and gl entries for PR 2014-08-11 16:12:31 +05:30
Nabin Hait
a6b597a0bd Fixes in Order trends report 2014-08-11 11:54:37 +05:30
Rushabh Mehta
b5e768906a built item grids for sales, purchase, stock 2014-08-08 11:56:31 +05:30
Anand Doshi
8f49cf7c03 [minor] fixed testcase 2014-07-25 13:02:29 +05:30
Anand Doshi
62b1cbf003 [impact] Limit available functions in jinja environment 2014-07-25 13:02:29 +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
Anand Doshi
7fcb3c9865 [minor] Item query - search by description 2014-07-21 17:51:32 +05:30
nabinhait
711e8bec3d Fixes overflow tolerance 2014-07-19 17:00:15 +05:30
nabinhait
b1c5738a67 Fixes overflow tolerance 2014-07-19 16:53:45 +05:30
nabinhait
614fb750b7 set qty as per stock uom in entire purchase cycle 2014-07-14 10:48:12 +05:30
nabinhait
e6cee7b41f Expense account can be liability account for stock reconciliation 2014-07-14 10:48:11 +05:30
nabinhait
d5fb5d91e9 overflow validation fixed 2014-07-10 15:27:27 +05:30
Anand Doshi
48d3b54e02 Fixes in queries 2014-07-09 13:15:03 +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
80a988c04f BugFix: selling_controller.py 2014-07-07 11:35:54 +05:30
Anand Doshi
dffec8fb85 Reapply Price List on Change 2014-07-04 15:44:48 +05:30
nabinhait
23cce731ab Fixes in action, not defined if called from outside document class 2014-07-03 12:25:06 +05:30
Rushabh Mehta
c53efc0d6c fix status_updater - update delivery status in Sales Order from Sales Invoice 2014-07-01 18:42:30 +05:30
Anand Doshi
4aa2380de2 Fixed get_sender for Sales and Jobs 2014-06-30 12:19:22 +05:30
Nabin Hait
00778c9a1e Validate expense account for perpetual inventory 2014-06-25 19:12:24 +05:30
Anand Doshi
a740f750c7 Stock Entry: Serial No Mandatory when purpose in Material Transfer, Sales Return, Purchase Return 2014-06-25 13:31:02 +05:30
Anand Doshi
faefeaa644 Warehouse query filtered by company 2014-06-24 18:53:04 +05:30
Rushabh Mehta
864d1ea87f fix end of life query for item 2014-06-23 12:20:39 +05:30
Nabin Hait
444f956e7b Pricing Rule fixes and improvements. Fixes #1795 2014-06-20 16:00:45 +05:30
Anand Doshi
496123a646 Inventory Accounting: Cost Center only required for Expense Account 2014-06-19 19:25:19 +05:30
Nabin Hait
98d9d797fd Tax category validation ignored in material request 2014-06-16 15:54:05 +05:30
Nabin Hait
e1b2b3e995 Account common get_query 2014-06-16 15:03:36 +05:30
Anand Doshi
ccf370f813 Fixed item query 2014-06-16 13:50:11 +05:30
Anand Doshi
0521814dea Fixed item query 2014-06-16 13:25:20 +05:30
Rushabh Mehta
6def968c3c minor fix for outgoing communication email 2014-06-12 10:31:43 +05:30
Nabin Hait
977331806b Set missing values only in unsubmitted documents 2014-06-05 17:55:00 +05:30
Nabin Hait
86207afe15 Set missing values only in unsubmitted documents 2014-06-05 17:55:00 +05:30
Nabin Hait
704a453b7a Set missing values only in unsubmitted documents 2014-06-05 17:55:00 +05:30
Nabin Hait
b7438894f6 Fixes in trends report 2014-06-05 17:55:00 +05:30
Nabin Hait
c3d1d6a946 cleanup raw materials supplied table for sub-contraction. Fixes #1743 2014-06-04 19:00:56 +05:30
Nabin Hait
cb9bdf43f6 over billing validation fixed 2014-05-30 11:22:16 +05:30
Nabin Hait
c3cbe2a30c minor fixes in sales invoice validation 2014-05-30 11:22:13 +05:30
Nabin Hait
ea4aa04cc4 Search query for account cleanup 2014-05-30 11:22:11 +05:30
Nabin Hait
a3dd72a759 Pricing Rule 2014-05-30 11:22:10 +05:30
Nabin Hait
08dd6af446 Update status based on communication. Fixes #1682 2014-05-26 15:06:42 +05:30
Pratik Vyas
e35a1025c9 hotfix: communication email bug 2014-05-22 18:37:55 +05:30
Nabin Hait
85786f3071 Support ticket / lead status based on communication. Fixes #1645 2014-05-19 19:31:40 +05:30
Nabin Hait
75e50ee082 Fixes for subcontracting 2014-05-11 12:11:15 +05:30
Nabin Hait
966edff222 minor fix 2014-05-09 10:54:12 +05:30
Nabin Hait
344f4436f1 Create / update raw materials supplied table for sub-contracting 2014-05-08 19:08:20 +05:30
Nabin Hait
23649c6852 fixe in query.py 2014-05-07 19:18:15 +05:30
Nabin Hait
90f2d8d9fc minor fix 2014-05-07 14:55:09 +05:30
Anand Doshi
69e0cb5d6f Fixed POS and Sales Invoice paid amount display, when invoice not submitted. Fixes #1573 2014-05-04 19:37:45 +05:30
Nabin Hait
296d626e53 Back flush issue fixed in sub contracting #1567 2014-05-02 17:36:13 +05:30
Nabin Hait
2cebf9b499 minor fix #1565 2014-05-02 16:12:07 +05:30
Nabin Hait
6b03914731 asynchronus issue in get_party_details 2014-05-02 15:45:10 +05:30
Nabin Hait
1e6c32e95f Address and contact creation from opportunity #1570 2014-05-02 11:42:24 +05:30
Nabin Hait
d341254786 Purchase receipt to purchase invoice item 2014-05-01 17:42:21 +05:30
Nabin Hait
5b98340d15 payment to invoice matching 2014-05-01 15:43:22 +05:30
Nabin Hait
613919325d Fixes in link field queries 2014-04-30 20:30:33 +05:30
Anand Doshi
b054eb7a4f Call calculate_taxes_and_totals after mapping 2014-04-22 20:35:22 +05:30
Anand Doshi
424c033395 Removed controller.py 2014-04-21 15:06:56 +05:30
Anand Doshi
ac32bad25a Fixes in Taxes, Quotation and Address Territory 2014-04-18 01:32:02 +05:30
Anand Doshi
de1a97d506 Fixes get_voucher_detail for Stock Reconcilation 2014-04-17 11:37:46 +05:30
Anand Doshi
094610d7ce Fixes in Production, Stock Entry and Stock Controller 2014-04-16 20:23:24 +05:30
Rushabh Mehta
eea802298e refactor get_voucher_details in stock_controller 2014-04-16 19:38:40 +05:30
Rushabh Mehta
052fe82688 production order: test fixed and added in test_stock_entry.py 2014-04-16 19:20:11 +05:30
Rushabh Mehta
c38fc713c6 updated translations 2014-04-16 17:46:30 +05:30
Anand Doshi
652bc0784a Ported v3 fixes to v4 
Commit range: webnotes/erpnext@e4b72df2f4bd7272c42e90f6faec3c27aa763b82..webnotes/erpnext@85441b0180f84246259d5a0ab4e3bcbf29355efe
 2014-04-16 15:26:42 +05:30
Nabin Hait
a0c239db8d perpetual inventory fix related to sub-contracting 
Cherry-picked and modified by @anandpdoshi

Conflicts:
	accounts/doctype/purchase_invoice/purchase_invoice.py
	controllers/buying_controller.py
	controllers/stock_controller.py
 2014-04-16 15:23:10 +05:30