Nabin Hait
dd38a266b8
Removed tname and fname from code
2014-12-26 13:15:21 +05:30
Rushabh Mehta
a9ba5eff99
[design] pos
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
Anand Doshi
f87a622ef0
[minor] use frappe.attach_print() in salary slip and recurring document
2014-12-15 23:14:35 +05:30
ankitjavalkarwork
5edae0e47b
[ #2314 ] Add selectable BOM field for Subcontracted Item
2014-12-04 15:54:54 +05:30
Nabin Hait
cc11045fd3
minor fix
2014-11-28 16:59:32 +05:30
Rushabh Mehta
6d950d23a8
[merge]
2014-11-28 12:08:51 +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
Nabin Hait
5288bdeabb
Minor fix
2014-11-03 15:08:21 +05:30
Rushabh Mehta
39dbf73de7
[merge] item-variants
2014-10-21 13:24:46 +05:30
Rushabh Mehta
be1a8d82c5
[merge] develop
2014-10-21 13:14:55 +05:30
Rushabh Mehta
ab43942b35
Merge pull request #2231 from rmehta/item-variants
...
Item variants
2014-10-21 12:38:16 +05:30
Nabin Hait
f1a07ff105
Allow zero rate while reposting
2014-10-15 12:23:35 +05:30
Nabin Hait
fb6e434315
Guess valuation rate in case of negative stock
2014-10-15 11:34:40 +05:30
Nabin Hait
38d0ed9f3a
Negative stock allowed for perpetual inventory. Blocked in specific case
2014-10-14 16:08:19 +05:30
Nabin Hait
bc8b20ae3c
Allocate entire advance amount if advance against SO/PO
2014-10-13 10:48:26 +05:30
Nabin Hait
4d74216147
Maintain negative stock balance if balance qty is negative
2014-10-09 19:25:19 +05:30
ankitjavalkarwork
e69a611991
[ #2164 ] New field names in DN, fix field name refs, Patch added
2014-10-09 17:31:46 +05:30
ankitjavalkarwork
9aadb0d95d
[ #2164 ] Add Delivered Qty to Sales Inv from Delivery Note, fix issues
2014-10-09 17:31:46 +05:30
Nabin Hait
fce2881de6
minor fix
2014-10-08 18:38:27 +05:30
Nabin Hait
e96e83d557
stock reco and repost vouchers
2014-10-08 18:06:14 +05:30
Nabin Hait
6c48ef781b
Utility: Repost stock ledger entries and gl entries for all stock transactions
2014-10-08 11:02:18 +05:30
Nabin Hait
adeb976a1b
Block negative stock in perpetual inventory
2014-10-08 11:02:18 +05:30
Rushabh Mehta
c62b6a815b
[tests] fixes to stock entry
2014-10-07 17:15:30 +05:30
Rushabh Mehta
724f9e57e3
[item-variants] get table values from template if not set in variant #2224
2014-10-07 15:29:58 +05:30
ankitjavalkarwork
6c29d8789a
[fix][ #1769 ] Add disable option to Sales/Purchase Tax Master with validation
2014-10-07 14:44:37 +05:30
Rushabh Mehta
ef276045c4
[item variants] make variants, bom updates
2014-10-07 11:40:47 +05:30
Nabin Hait
997a7a1d3e
Test case fixes
2014-10-06 13:15:21 +05:30
Nabin Hait
3225102eb9
Update outstanding amt based on party
...
Party mandatory if account is receivable/payable
Fetch advance based on party
Reconciliation splitting logic based on party
2014-10-06 13:09:18 +05:30
Nabin Hait
cc582bd774
posted party in gl entry and multiple other fixes
2014-10-06 13:06:11 +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
Nabin Hait
c68646c694
[merge] 4.x to 5.0
2014-10-06 12:57:48 +05:30
Rushabh Mehta
e1446eb516
[fix] quotation status
2014-09-29 14:09:50 +05:30
Rushabh Mehta
20fa996dfa
[fix] quotation status
2014-09-29 13:58:40 +05:30
Rushabh Mehta
66e08e39f7
[fix] currency moved to frappe
2014-09-29 12:17:03 +05:30
Nabin Hait
b9e04815f8
Repost gl entries for future stock vouchers
2014-09-26 14:24:42 +05:30
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
Rushabh Mehta
82d8a637ac
#1252
2014-04-16 09:20:00 +05:30
Rushabh Mehta
8a40c136ce
more message fixing
2014-04-15 16:31:20 +05:30
Rushabh Mehta
9f0d625300
update translation strings #1403
2014-04-14 19:20:45 +05:30
Anand Doshi
bd67e87921
Fixes saving of Sales Order and fetching Prices frappe/frappe#478
2014-04-11 16:51:27 +05:30
Pratik Vyas
f7daab7393
pass only valid columns to get_item_details
2014-04-10 17:53:30 +05:30
Anand Doshi
233fbb08b2
Minor fix
2014-04-10 12:53:16 +05:30
Anand Doshi
9fd50bcfb6
Fixed rest of the test cases frappe/frapp#478
2014-04-09 19:20:01 +05:30
Anand Doshi
d29465029d
Fixed Test Cases frappe/frappe#478
2014-04-08 20:15:22 +05:30
Anand Doshi
2ce39cf770
Fixed Stock Entry Test Cases frappe/frappe#478
2014-04-07 18:51:58 +05:30
Nabin Hait
dc82d4f0cd
frappe/frappe#478 fixes
2014-04-07 12:02:57 +05:30
