Nabin Hait
|
e040510545
|
Always calculate additional discount amount if percentage is mentioned
|
2016-10-13 12:14:47 +05:30 |
|
Nabin Hait
|
cd9c45f816
|
Fixed merge conflict
|
2016-10-07 16:53:07 +05:30 |
|
Nabin Hait
|
2f75b7b42e
|
Fixed merge conflict
|
2016-10-07 14:16:17 +05:30 |
|
Rohit Waghchaure
|
770d04e633
|
[Fix] sales order status showing completed, while it's status was to bill
|
2016-10-07 13:55:48 +05:30 |
|
Rohit Waghchaure
|
7d5298997b
|
Documentation for payments
|
2016-10-06 16:49:39 +05:30 |
|
Nabin Hait
|
558f526a68
|
Fixed version conflict
|
2016-10-05 17:18:36 +05:30 |
|
Nabin Hait
|
cccc45edc5
|
Don't throw expense account validation on fetching item details
|
2016-10-05 17:15:53 +05:30 |
|
Nabin Hait
|
5fd5a77750
|
Fixed version conflict
|
2016-10-03 14:13:50 +05:30 |
|
Saurabh
|
4f62c4cf2d
|
[minor][fix] for condition maker
|
2016-10-03 12:48:25 +05:30 |
|
Rohit Waghchaure
|
21499e820d
|
[Enhancement] Supplier quotation added on supplier portal
|
2016-09-21 17:07:25 +05:30 |
|
Chude Osiegbu
|
256ec170d0
|
Corrections properly distinguish between transaction_date and posting_date as the basis for determining translation date that is passed to get_exchange_rate
|
2016-09-19 03:53:37 +01:00 |
|
Chude Osiegbu
|
1f64f9897c
|
Additional corrections for cases where get_exchange_rate was not called with the correct number of arguments.
|
2016-09-19 01:34:49 +01:00 |
|
Chude Osiegbu
|
7e74fb4357
|
Modification to set_price_list_currency in accounts_controller.py to allow for specification of date in get_exchange_rate call
|
2016-09-19 00:59:25 +01:00 |
|
RobertSchouten
|
db33ebb0ff
|
[fix] status updater percent when qty is minus value
|
2016-09-12 14:54:46 +08:00 |
|
robert schouten
|
6465711ca6
|
[fix] missing gl entries warnings
|
2016-09-12 11:17:14 +08:00 |
|
Nabin Hait
|
b8b228ed14
|
Fixed version conflict
|
2016-09-06 17:56:32 +05:30 |
|
Nabin Hait
|
ca627fb806
|
[fix] Fetch advance journal entry in invoice if it is tagged against linked order
|
2016-09-05 16:17:08 +05:30 |
|
Nabin Hait
|
406f0a38de
|
Fixed merge conflicts
|
2016-09-05 15:44:18 +05:30 |
|
Nabin Hait
|
8693b5c93a
|
Minor fixes
|
2016-09-05 11:51:45 +05:30 |
|
Rohit Waghchaure
|
560ba391f9
|
[Enhancement] Purchase return for rejected qty
|
2016-09-05 00:43:17 +05:30 |
|
Nabin Hait
|
5c69fed218
|
Ignore closed sales/purchase order in trends report
|
2016-09-02 12:53:18 +05:30 |
|
Rohit Waghchaure
|
609e2b4ca3
|
[POS] Currency format issue
|
2016-08-31 02:04:53 +05:30 |
|
Nabin Hait
|
a26bb96d2d
|
Merge pull request #6178 from nabinhait/status_updater_fix
Ignore validating billed amount against order if order item amount is zero
|
2016-08-26 12:09:39 +05:30 |
|
Nabin Hait
|
47a3f639ed
|
Ignore validating billed amount against order if order item amount is zero
|
2016-08-26 11:39:39 +05:30 |
|
Rohit Waghchaure
|
efb5bf2cfc
|
[POS] Fixed payment gl entry for sales return
|
2016-08-25 16:23:47 +05:30 |
|
Rohit Waghchaure
|
ea6d7e9b09
|
[Fix] decimal button not working
|
2016-08-23 11:39:44 +05:30 |
|
Nabin Hait
|
3b6dc141c6
|
[fix] Repost only distinct purchase receipts and invoices
|
2016-08-19 16:39:50 +05:30 |
|
Rohit Waghchaure
|
baef2624a2
|
Given provision to enter write off and change amount on POS
|
2016-08-10 00:50:53 +05:30 |
|
Rohit Waghchaure
|
7127a8f522
|
Allow user to edit change amount from sales invoice form for is pos
|
2016-08-08 23:19:18 +05:30 |
|
Nabin Hait
|
99d4ff4a29
|
Repost gle for future transactions if update stock checked in back dated purchase invoice
|
2016-08-08 14:12:58 +05:30 |
|
Nabin Hait
|
3bb1a421f0
|
Change amount calcualtion in POS if there is write off amount and gl entries in this scenario
|
2016-08-02 16:41:15 +05:30 |
|
Rohit Waghchaure
|
26cf01aaba
|
[mionr] fixes and cleanups
|
2016-07-26 00:30:25 +05:30 |
|
Maxwell Morais
|
3557261313
|
Extend search_fields for customer querie
This PR is intended to extend the customer querie adding the meta-info from the doctype using the search fields to extend the customer querie
|
2016-07-21 23:42:59 -03:00 |
|
Rushabh Mehta
|
fc8e589295
|
[fix] party status updating bug, fixes #5794, #5796
|
2016-07-20 12:09:27 +05:30 |
|
Rushabh Mehta
|
5c52fa9785
|
[fix] variant error message
|
2016-07-18 14:40:14 +05:30 |
|
Rushabh Mehta
|
95383bb281
|
[fix] item attribute validation and tests
|
2016-07-15 15:12:06 +05:30 |
|
Rushabh Mehta
|
20122aef79
|
[minor] optimize item attribute validation for #5756
|
2016-07-15 12:42:41 +05:30 |
|
Rushabh Mehta
|
b8bdfbcead
|
[minor] optimize item attribute validation for #5756
|
2016-07-15 12:41:08 +05:30 |
|
Rushabh Mehta
|
ea0ff23891
|
[cleanup] form dashboards
|
2016-07-07 14:28:05 +05:30 |
|
Rohit Waghchaure
|
a71d9d33af
|
Rename prevdoc field in purchase order and purchase receipt doctype
|
2016-07-06 12:13:29 +05:30 |
|
Nabin Hait
|
ff2f3ef1b1
|
Test Case Fixes
|
2016-07-04 11:42:25 +05:30 |
|
Nabin Hait
|
9db1b223da
|
Payment Entry: Test cases and default remarks
|
2016-07-04 11:42:24 +05:30 |
|
Nabin Hait
|
13093b4b68
|
Make payment entry aginst order, payment request and patch to rename advance table fields
|
2016-07-04 11:42:24 +05:30 |
|
Nabin Hait
|
05aefbbf5d
|
Payment Entry from invoice
|
2016-07-04 11:42:24 +05:30 |
|
Nabin Hait
|
1991c7b17d
|
Payment Reconciliation changes for Payment Entry
|
2016-07-04 11:42:24 +05:30 |
|
Nabin Hait
|
28a0528ae4
|
Advance Payment Entry adjustment against Invoice
|
2016-07-04 11:42:04 +05:30 |
|
Nabin Hait
|
e3a10170f7
|
Payment Entry submission and more
|
2016-07-04 11:41:24 +05:30 |
|
Nabin Hait
|
12e2a51519
|
[new][feature] Payment Entry
|
2016-07-04 11:41:24 +05:30 |
|
Rushabh Mehta
|
b33df4afe8
|
[cleanup] link methods made common
|
2016-07-04 11:39:25 +05:30 |
|
Rushabh Mehta
|
878dfec46a
|
[minor]
|
2016-07-04 11:39:25 +05:30 |
|
Saurabh
|
78333c7e07
|
[fixes] check group condition
|
2016-06-26 14:27:46 +05:30 |
|
Saurabh
|
7fecb50360
|
[enhance] rename warehouse account type to stock
|
2016-06-26 14:27:46 +05:30 |
|
Saurabh
|
4d02949814
|
[fixes] validate trash condition for warehouse and related account, move existing warehouses under all warehouse group, set account parent and is group for warehouse account
|
2016-06-25 11:06:14 +05:30 |
|
Saurabh
|
ec8babe7ac
|
[minor][fix]
|
2016-06-25 11:06:14 +05:30 |
|
Rushabh Mehta
|
a334062b03
|
[redesign] website routing system
|
2016-06-24 16:18:07 +05:30 |
|
Rushabh Mehta
|
2cb7a9f235
|
[ux] taxes table editable
|
2016-06-15 16:45:03 +05:30 |
|
Alec Ruiz-Ramon
|
fcaaa29a58
|
Status updater for quotation/lost to lead, quotation lost to oppt, and to set conversion as priority in lead
cleanup
squashed
|
2016-06-09 21:17:57 -04:00 |
|
Anand Doshi
|
34482788f4
|
[fix] removed bad import
|
2016-06-09 16:57:16 +05:30 |
|
Rushabh Mehta
|
aed79e993f
|
[fix] item attribute validation, fixes #5308
|
2016-06-02 17:49:16 +05:30 |
|
Nabin Hait
|
591a5aba56
|
Added Project in GL Entry and General Ledger report
|
2016-05-26 17:51:20 +05:30 |
|
Rohit Waghchaure
|
5d97d89a03
|
[Fix] Sales Invoice shows default date while no default mentioned
|
2016-05-17 15:13:17 +05:30 |
|
Rushabh Mehta
|
d42167e0e5
|
[cleanup] remove Features Setup
|
2016-05-11 16:47:14 +05:30 |
|
Nabin Hait
|
b81ed45b2b
|
fixed conflict
|
2016-05-11 12:52:31 +05:30 |
|
Rohit Waghchaure
|
6087fe178e
|
[Enhancement] POS
|
2016-05-09 23:36:15 +05:30 |
|
Nabin Hait
|
a9c4c8fc31
|
In Purchase Return entry, make sle and gle as per actual inward entry's valuation rate
|
2016-05-09 17:34:47 +05:30 |
|
Nabin Hait
|
332d29f166
|
Merge branch 'master' into develop
|
2016-05-06 16:13:35 +05:30 |
|
Nabin Hait
|
8704bead49
|
[fix] Validate returned serial nos and batch nos with original document
|
2016-05-06 15:30:10 +05:30 |
|
Nabin Hait
|
cd0e8ce8ad
|
Fixes and modification in fixed asset
|
2016-04-20 17:57:12 +05:30 |
|
Nabin Hait
|
3d9c5c0c20
|
Fixed Asset module cleanup and fixes
|
2016-04-20 17:57:11 +05:30 |
|
Nabin Hait
|
14aa9c5320
|
[fix] Cleanup and fixes in update stock feature in Purchase Invoice
|
2016-04-18 16:59:47 +05:30 |
|
Nabin Hait
|
ffd1e4efe6
|
Removed db_set from inside validate
|
2016-04-18 15:58:44 +05:30 |
|
Saurabh
|
fbb342c1ac
|
[enhancement] update landed cost on PI via landed cost voucher when update stock is set on PI
|
2016-04-18 15:58:43 +05:30 |
|
Saurabh
|
130c57b201
|
[fixes] code clean-up
|
2016-04-18 15:58:43 +05:30 |
|
Saurabh
|
e29248bcb3
|
[fixes] test-case to validate quantity after update stock and purchase return and code-cleaning
|
2016-04-18 15:58:43 +05:30 |
|
Saurabh
|
43520f93a1
|
[fixes] test cases, code cleanup.
|
2016-04-18 15:58:42 +05:30 |
|
jof2jc
|
524ebbcbb9
|
Added Make Receipt (Update Stock) and IsCash option on Purchase Invoice
|
2016-04-18 15:57:55 +05:30 |
|
Umair Sayyed
|
72534deea2
|
removed Is Sales Item and Is Purchase Item
|
2016-04-15 12:57:00 +05:30 |
|
Nabin Hait
|
972c25f78d
|
Fixed conflict
|
2016-04-14 18:25:53 +05:30 |
|
Rohit Waghchaure
|
ae270d6648
|
[Fixes] Supplier can view their addresses, default buying price list issue
|
2016-04-11 13:58:33 +05:30 |
|
Anand Doshi
|
2f957f27b0
|
[fix] apply Tax Rule for lead
|
2016-04-08 17:43:08 +05:30 |
|
Rushabh Mehta
|
203cc962f5
|
[enhancement] Item Selector
|
2016-04-08 17:21:00 +05:30 |
|
Anand Doshi
|
15f7b1ee1a
|
[fix] POS paid amount validation using grand total
|
2016-04-04 15:03:28 +05:30 |
|
Rushabh Mehta
|
948ebfef16
|
Merge pull request #5108 from neilLasrado/expense-querry
Fixed bug in get expense query
|
2016-04-01 11:44:11 +05:30 |
|
Rushabh Mehta
|
8ca426d94a
|
Merge pull request #5095 from rohitwaghchaure/new_rfq
[Enhancement] Added currency symbol on RFQ form of supplier portal, currency validation for party
|
2016-04-01 11:41:15 +05:30 |
|
Rushabh Mehta
|
fff8e6c733
|
Merge pull request #5080 from nabinhait/fy_overlap
[fix] Added overlap validation in fiscal year
|
2016-04-01 11:37:03 +05:30 |
|
Neil Trini Lasrado
|
30b97b0b45
|
Fixed bug in get expense query
|
2016-03-31 23:10:13 +05:30 |
|
rohitwaghchaure
|
62fea0374b
|
[Enhancement] Added currency symbol on RFQ form of supplier portal, currency validation for party
|
2016-03-31 21:49:07 +05:30 |
|
Rushabh Mehta
|
acf28af19c
|
[fix] set default depreciation accounts and test fix
|
2016-03-31 15:04:06 +05:30 |
|
Nabin Hait
|
2ed0b59747
|
[fix] Added overlap validation in fiscal year
|
2016-03-31 12:40:37 +05:30 |
|
Nabin Hait
|
6123560f51
|
Merge pull request #5076 from vjFaLk/develop
Fix for Opportunity
|
2016-03-31 11:55:07 +05:30 |
|
Nabin Hait
|
c6285069dc
|
[fix] Item query in bom
|
2016-03-30 13:10:25 +05:30 |
|
Rushabh Mehta
|
c78b3110b5
|
[enhancement] configurable portal menu;
|
2016-03-30 12:29:48 +05:30 |
|
Nabin Hait
|
e8e2d406b5
|
minor fix
|
2016-03-29 18:17:03 +05:30 |
|
Rushabh Mehta
|
1d05ada5e9
|
Merge pull request #4950 from nabinhait/fixed_asset_depreciation
Fixed asset depreciation
|
2016-03-29 16:39:31 +05:30 |
|
Rushabh Mehta
|
7a1b5da830
|
[cleanup] request for quotation cleanup
|
2016-03-29 16:04:43 +05:30 |
|
Nabin Hait
|
4fdb05228d
|
fixed asset depreciation
|
2016-03-29 11:54:37 +05:30 |
|
Nabin Hait
|
3a15c92c5e
|
Fixed Asset Depreciation first commit
|
2016-03-29 11:54:37 +05:30 |
|
Valmik Jangla
|
29563275f5
|
Fix for Opportunity
|
2016-03-29 11:18:36 +05:30 |
|
Rushabh Mehta
|
d3fdbaa261
|
Merge pull request #5041 from nabinhait/recurring_doc_amend
[fix] Reset recurring id on amendment
|
2016-03-28 18:29:44 +05:30 |
|
Rushabh Mehta
|
e1b20a0b29
|
Merge pull request #5044 from rohitwaghchaure/add_margin_feature
[Enhancement] Add margin in sales flow.
|
2016-03-28 18:27:05 +05:30 |
|