Nabin Hait
|
014c30c90d
|
Merge pull request #6339 from rohitwaghchaure/pos_enhancement
[Enhancement] POS changes and fixes
|
2016-09-12 17:35:40 +05:30 |
|
Nabin Hait
|
33a20bdb13
|
Merge pull request #6340 from nabinhait/se_difference_account
Remove Difference Account field from Stock Entry parent form
|
2016-09-12 17:34:59 +05:30 |
|
Rushabh Mehta
|
daee449063
|
[fix] for print format draft (#6346)
|
2016-09-12 16:42:36 +05:30 |
|
pawan
|
af111e9c43
|
[fix] #6195
|
2016-09-12 15:16:23 +05:30 |
|
Rohit Waghchaure
|
e1d59d6dde
|
test cases and minor changes
|
2016-09-12 13:27:28 +05:30 |
|
Rohit Waghchaure
|
1d0e8ea9c6
|
minor changes
|
2016-09-12 13:27:27 +05:30 |
|
Rohit Waghchaure
|
3815ebff8a
|
Added %billed in timesheet
|
2016-09-12 13:27:27 +05:30 |
|
Rohit Waghchaure
|
a6927e05ba
|
set project wise timesheet data
|
2016-09-12 13:27:27 +05:30 |
|
Rohit Waghchaure
|
cc8644f86e
|
[Timesheet] Field rearrange
|
2016-09-12 13:27:27 +05:30 |
|
Nabin Hait
|
a36a88b6de
|
Remove Difference Account field from Stock Entry parent form
|
2016-09-12 13:15:59 +05:30 |
|
Rohit Waghchaure
|
60a05324ce
|
POS changes and fixes
|
2016-09-12 13:11:10 +05:30 |
|
Nabin Hait
|
294664b24c
|
Merge pull request #6267 from PawanMeh/fixes_6254
[fix] #6254
|
2016-09-12 13:03:14 +05:30 |
|
robert schouten
|
4fc70d962b
|
add customer and supplier names to some reports
|
2016-09-12 15:23:51 +08:00 |
|
robert schouten
|
ea3b342dde
|
fix display unclosed values for trial/balance/sheet
|
2016-09-12 14:37:58 +08:00 |
|
RobertSchouten
|
bd979ec1ed
|
[fix] itemwise sales register add sales invoice to delivery note when update stock
in item wise sales register put sales invoice into delivery note field when delivery note is null and update stock ticked
|
2016-09-12 09:46:10 +08:00 |
|
Saurabh
|
b835fef8ac
|
[enhancement] modify payment request to get payment url (#6097)
* [enhancement] modify payment request to get payment url
* redirect to payment url if payment initiated via shopping cart
|
2016-09-09 11:19:22 +05:30 |
|
Nabin Hait
|
0a0df2e433
|
fixed version conflict
|
2016-09-07 17:01:47 +05:30 |
|
Nabin Hait
|
23147ff881
|
Patch fixed
|
2016-09-07 16:59:55 +05:30 |
|
Nabin Hait
|
c16c0ca944
|
Merge pull request #6310 from rohitwaghchaure/pos_itemwise_tax_issue
[Fix] Item level taxes are not getting calculated in POS
|
2016-09-07 15:59:32 +05:30 |
|
Rohit Waghchaure
|
525900c5c1
|
[Fix] Item level taxes are not getting calculated in POS
|
2016-09-07 15:01:08 +05:30 |
|
pawan
|
7b2bd20a09
|
[fix] #6254
|
2016-09-06 18:28:41 +05:30 |
|
Nabin Hait
|
b8b228ed14
|
Fixed version conflict
|
2016-09-06 17:56:32 +05:30 |
|
RobertSchouten
|
5ae21053bd
|
fix for closing balance typo
|
2016-09-06 15:44:09 +08:00 |
|
Rohit Waghchaure
|
377c7acd53
|
[POS] Added offline_pos_name in print format
|
2016-09-05 17:59:01 +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 |
|
pawan
|
bd9a275d5f
|
[fix] #6254
|
2016-09-02 16:51:22 +05:30 |
|
Nabin Hait
|
15b26d8b1a
|
Fixed merge conflicts
|
2016-09-02 14:29:57 +05:30 |
|
Nabin Hait
|
5a4ca64c4a
|
Party name in Payment Entry and cheque print format
|
2016-09-02 14:20:01 +05:30 |
|
Nabin Hait
|
f8e374643c
|
Merge pull request #6257 from nabinhait/letter_head_in_report
Default letter head in report printing based on selected company
|
2016-09-02 14:17:12 +05:30 |
|
Saurabh
|
ff910f4c72
|
[fixes] set filter for warehouse
|
2016-09-02 13:39:05 +05:30 |
|
Nabin Hait
|
13b37c6346
|
Default letter head in report printing based on selected company
|
2016-09-02 11:25:42 +05:30 |
|
Rushabh Mehta
|
b2f0920346
|
[minor] new global for query report filters
|
2016-09-01 17:53:42 +05:30 |
|
Nabin Hait
|
2490ea0b91
|
Fixed merge conflict
|
2016-09-01 12:29:31 +05:30 |
|
Rohit Waghchaure
|
774ce63b75
|
remove mode of payment, migrate mode of payment from v6 to v7
|
2016-08-31 21:21:41 +05:30 |
|
Rohit Waghchaure
|
879cb6ebee
|
[POS] Fixed POS Sales Invoice when Payment Table is Empty
|
2016-08-31 14:41:48 +05:30 |
|
Nabin Hait
|
566759acae
|
Merge pull request #6211 from rohitwaghchaure/v7.1_fixes
[Fix] Billing Hours showing blank on sales invoice
|
2016-08-31 12:12:48 +05:30 |
|
Rohit Waghchaure
|
a2bf16bfaa
|
[Fix] Billing Hours showing blank on sales invoice
|
2016-08-29 13:37:13 +05:30 |
|
Nabin Hait
|
338e63c448
|
Fixed version conflict
|
2016-08-29 11:47:50 +05:30 |
|
Rohit Waghchaure
|
63bdd679d0
|
[POS] Fixes and cleanup
|
2016-08-27 02:53:36 +05:30 |
|
Kanchan Chauhan
|
dd96cbd012
|
Coded column deleted, column added from UI
|
2016-08-26 14:32:38 +05:30 |
|
Nabin Hait
|
4403cf71b5
|
Merge pull request #6152 from rohitwaghchaure/profitability_report
[Report] Profitability Analysis
|
2016-08-26 13:21:01 +05:30 |
|
Rohit Waghchaure
|
0cb171feb2
|
[Enhancement] Added billing hours for account user in timesheet
|
2016-08-26 13:17:46 +05:30 |
|
Nabin Hait
|
e334813daf
|
Merge pull request #6166 from neilLasrado/demo
Merged Schools Demo into ERPNext
|
2016-08-26 13:05:43 +05:30 |
|
Rohit Waghchaure
|
6462ba4e0b
|
minor changes
|
2016-08-26 12:42:52 +05:30 |
|
Nabin Hait
|
0da75aede3
|
Fixed merge conflict
|
2016-08-26 12:40:02 +05:30 |
|
Nabin Hait
|
06b27757ab
|
Merge pull request #6179 from rohitwaghchaure/minor_fix_patch
[Sales Return] Minor fix in patch
|
2016-08-26 12:33:33 +05:30 |
|
Rohit Waghchaure
|
e21e1ebae2
|
[Sales Return] Minor fix in patch
|
2016-08-26 12:31:41 +05:30 |
|
Nabin Hait
|
0a99b4347b
|
Party mandatory message
|
2016-08-26 12:30:45 +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 |
|
Neil Trini Lasrado
|
067245933e
|
Fixed Demo
|
2016-08-25 18:31:42 +05:30 |
|
Rohit Waghchaure
|
efb5bf2cfc
|
[POS] Fixed payment gl entry for sales return
|
2016-08-25 16:23:47 +05:30 |
|
Rohit Waghchaure
|
1e8732abc2
|
removed old report
|
2016-08-24 19:20:58 +05:30 |
|
Rohit Waghchaure
|
5794ffd43d
|
added filters project and cost center in profit and loss statement, open profit and loss statement on click of cost center/project in profitability analysis
|
2016-08-24 19:12:14 +05:30 |
|
Rohit Waghchaure
|
1255a6627e
|
project based profitability Analysis
|
2016-08-24 18:01:39 +05:30 |
|
Rohit Waghchaure
|
78e08b8af5
|
[Report] Profitability Analysis
|
2016-08-24 18:00:22 +05:30 |
|
Rohit Waghchaure
|
fb432821bf
|
[Report] Cost center wise profitability
|
2016-08-24 18:00:22 +05:30 |
|
Nabin Hait
|
cfbd0199eb
|
Merge branch 'master' into develop
|
2016-08-23 12:10:56 +05:30 |
|
Nabin Hait
|
26f9673ad9
|
Merge pull request #6126 from rohitwaghchaure/multiyear_financial_statements
[Enhancement] Multi year financial statements
|
2016-08-23 11:32:08 +05:30 |
|
Rohit Waghchaure
|
ca4d9b54cd
|
fixed accumulated values for cash flow
|
2016-08-22 17:51:58 +05:30 |
|
Pawan Mehta
|
bee3b40725
|
Update gross_profit.py
|
2016-08-22 17:47:13 +05:30 |
|
pawan
|
18bb431baa
|
[fix] #6089
|
2016-08-22 17:27:22 +05:30 |
|
pawan
|
851e05672c
|
[fix] #6089
|
2016-08-22 14:25:17 +05:30 |
|
Rohit Waghchaure
|
26b646f8a3
|
Added validation for fiscal year
|
2016-08-21 17:14:12 +05:30 |
|
Rohit Waghchaure
|
713e2b7b62
|
[POS] Fixed issue of paid amount, write off account
|
2016-08-19 19:27:16 +05:30 |
|
Rohit Waghchaure
|
4275c30059
|
[Enhancement] Multi year financial statements
|
2016-08-19 18:04:32 +05:30 |
|
Nabin Hait
|
b5951b72f3
|
Merge pull request #5924 from KanchanChauhan/salary-structure-changes
Formula based Salary Structure
|
2016-08-18 16:39:58 +05:30 |
|
Nabin Hait
|
f04ce3c5a6
|
[fix] check expense agaist budget
|
2016-08-18 16:14:23 +05:30 |
|
Nabin Hait
|
50f8262ac7
|
Currency fix in reports
|
2016-08-18 16:14:23 +05:30 |
|
Rohit Waghchaure
|
9d5a07d101
|
[POS] Fixed stock update issue
|
2016-08-18 13:27:06 +05:30 |
|
Kanchan Chauhan
|
bccf0fa041
|
[WIP] Formula based Salary Structure and multiple employees for same Salary Structure
|
2016-08-18 13:02:39 +05:30 |
|
Rushabh Mehta
|
b7bc6bd75d
|
[fix] better message for cost center, fixes #6109
|
2016-08-18 12:50:58 +05:30 |
|
Rushabh Mehta
|
b969c2cb60
|
[minor] budget link in cost center, fixes #6093
|
2016-08-18 12:36:20 +05:30 |
|
Nabin Hait
|
6fe3ac49cf
|
Merge pull request #6039 from rohitwaghchaure/allow_to_edit_change_amount
Allow to edit change amount
|
2016-08-17 17:08:54 +05:30 |
|
Rohit Waghchaure
|
e4e69ec027
|
changed field name, validation for change amount account, validation for serial no qty
|
2016-08-17 16:20:13 +05:30 |
|
Nabin Hait
|
95c998109d
|
Merge pull request #6043 from aruizramon/purchase-taxes-client-validation
Validate on changing from Total to Valuation/Valuation&Total when add…
|
2016-08-17 12:12:14 +05:30 |
|
Nabin Hait
|
4da2c81641
|
Merge pull request #6094 from rmehta/sales-purchase-items
[revert] is_sales_item, is_purchase_item back
|
2016-08-17 11:30:37 +05:30 |
|
Rushabh Mehta
|
d973c1606a
|
[revert] is_sales_item, is_purchase_item back
|
2016-08-16 11:32:08 +05:30 |
|
Rohit Waghchaure
|
9cd356c7f0
|
[POS] Fixed print qty decimal issue
|
2016-08-16 10:44:21 +05:30 |
|
Rohit Waghchaure
|
033ed00c56
|
[POS] fixed issue of negative stock
|
2016-08-11 16:37:29 +05:30 |
|
Rushabh Mehta
|
6c0d9579d2
|
Merge pull request #6055 from rohitwaghchaure/bank_reconciliation_statement_report_issue
[Fix] No permission to read DocType for account user in bank reconciliation statement report
|
2016-08-11 10:55:10 +05:30 |
|
Rohit Waghchaure
|
e78ef5f8c8
|
[Fix] No permission to read DocType for account user in bank reconciliation statement report
|
2016-08-11 00:46:15 +05:30 |
|
Rohit Waghchaure
|
315a5e1b4d
|
[Fix] Debit and credit not equal for purchase invoice, if update stock is yes and taxes is defined
|
2016-08-11 00:35:00 +05:30 |
|
Rushabh Mehta
|
a7d92bc8f6
|
Merge pull request #6050 from rohitwaghchaure/pos_serial_no_search_issue
[Fix] Serial no search issue, if serial no is similar with item code.
|
2016-08-10 18:52:17 +05:30 |
|
Rohit Waghchaure
|
ea5a32d304
|
[Fix] Searial no search issue, if serial no is similar with item code
|
2016-08-10 17:18:52 +05:30 |
|
Rushabh Mehta
|
185c247286
|
Merge pull request #6024 from rohitwaghchaure/get_account_of_payment_mode_issue
[Fix] Get account of the mode of payment on sales invoice and pos profile
|
2016-08-10 14:25:42 +05:30 |
|
pawan mehta
|
399a4bf201
|
[fix] #5723
|
2016-08-10 13:20:16 +05:30 |
|
Rohit Waghchaure
|
70be24d6f0
|
[Fix] Get account of the mode of payment on sales invoice and pos profile
|
2016-08-10 13:16:39 +05:30 |
|
aruizramon
|
8bd2487533
|
semicolon
|
2016-08-09 16:04:45 -04:00 |
|
Alec Ruiz-Ramon
|
08fb39f1ba
|
Validate on changing from Total to Valuation/Valuation&Total when add_deduct_tax is 'Deduct'
|
2016-08-09 15:38:34 -04:00 |
|
Rohit Waghchaure
|
baef2624a2
|
Given provision to enter write off and change amount on POS
|
2016-08-10 00:50:53 +05:30 |
|
Rushabh Mehta
|
ec2d09c557
|
[minor] setting up website optional in setup wizard
|
2016-08-09 16:44:37 +05:30 |
|
Rohit Waghchaure
|
c41ab8d15b
|
Added change amount account
|
2016-08-08 23:19:18 +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
|
ae65172dca
|
Added 'Ledger' button to show accounting entries against PCV
|
2016-08-08 15:44:45 +05:30 |
|
Nabin Hait
|
d261d40c7e
|
Fixed test cases for period closing voucher
|
2016-08-08 15:44:45 +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
|
3ef6e7847e
|
Merge pull request #6010 from rohitwaghchaure/minor_fix_pos
[Fix] pos ambiguous issue
|
2016-08-08 12:40:28 +05:30 |
|
Nabin Hait
|
2cb8c6a867
|
Merge pull request #6015 from nabinhait/ar_ap_cols
[fix] Label for ageing cols in AR/AP report
|
2016-08-08 12:37:19 +05:30 |
|
Nabin Hait
|
c30c342bdf
|
[fix] Label for ageing cols in AR/AP report
|
2016-08-08 11:47:13 +05:30 |
|
Rohit Waghchaure
|
cd6c00d505
|
[Fix] pos ambiguous issue
|
2016-08-07 14:29:21 +05:30 |
|
Saurabh
|
ec14c81ebd
|
[minor][fix] return if account details not found
|
2016-08-07 08:52:45 +05:30 |
|
Rohit Waghchaure
|
b77a1057ce
|
fixes and cleanups.
|
2016-08-06 12:45:02 +05:30 |
|
Nabin Hait
|
e1d85f2467
|
Payment Entry fix: Unallocated amount in payment entry considering deductions
|
2016-08-05 14:51:36 +05:30 |
|
Nabin Hait
|
f43e49f378
|
Set received amount based on paid amount if currency is same
|
2016-08-03 14:17:05 +05:30 |
|
Nabin Hait
|
6620e2a494
|
Test case fixed for pos gl entry
|
2016-08-02 17:14:28 +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
|
7f031d1bfd
|
minor fix in payment entry
|
2016-08-02 11:07:40 +05:30 |
|
Rohit Waghchaure
|
a88dec8775
|
[Fix] batch no searching in pos
|
2016-08-01 13:01:13 +05:30 |
|
Rushabh Mehta
|
9421a109cf
|
[fix] reports template
|
2016-07-29 18:52:00 +05:30 |
|
Nabin Hait
|
e7d0639edc
|
Set difference amount in Payment Entry as per field precision
|
2016-07-28 16:56:59 +05:30 |
|
Nabin Hait
|
2a2346422d
|
[fix] Set amounts only if party and bank account exists
|
2016-07-27 13:08:00 +05:30 |
|
Rohit Waghchaure
|
26cf01aaba
|
[mionr] fixes and cleanups
|
2016-07-26 00:30:25 +05:30 |
|
Rushabh Mehta
|
6c3ac9587e
|
[fix] quick entry
|
2016-07-25 15:03:39 +05:30 |
|
Neil Trini Lasrado
|
d69d961f2a
|
Removed Administrator role from Doctypes
|
2016-07-25 11:39:23 +05:30 |
|
Saurabh
|
6e0a00b537
|
[minor][fix] flag fix for payment entry creation via payment request
|
2016-07-22 15:43:27 +05:30 |
|
Saurabh
|
90c0b7fbea
|
[fix] payment request demo
|
2016-07-22 15:43:27 +05:30 |
|
Saurabh
|
e4e8954a19
|
[fix] make payment request without payment gateway
|
2016-07-22 15:43:26 +05:30 |
|
Nabin Hait
|
13e248af8d
|
Merge pull request #5833 from nabinhait/fix_108
Validate warehouse if update stock checked in Purchase Invoice
|
2016-07-22 13:21:43 +05:30 |
|
Nabin Hait
|
2b12a74fef
|
Merge pull request #5822 from nabinhait/fix_106
Unlink payment entries on cancellation of Invoice
|
2016-07-22 13:17:04 +05:30 |
|
Nabin Hait
|
8ecb78ba39
|
Validate warehouse if update stock checked in Purchase Invoice
|
2016-07-22 12:25:16 +05:30 |
|
Rohit Waghchaure
|
ea278b5971
|
[Fix]POS and timesheet issues
|
2016-07-22 01:22:56 +05:30 |
|
Nabin Hait
|
e0cc87d2d8
|
Unlink payment entries on cancellation of Invoice
|
2016-07-21 18:30:18 +05:30 |
|
Nabin Hait
|
89d0b1b9a5
|
Merge pull request #5804 from nabinhait/demo1
Demo data for fixed asset depreciation
|
2016-07-21 10:05:00 +05:30 |
|
Nabin Hait
|
ba33026a6b
|
Merge pull request #5798 from rohitwaghchaure/sales_invoice_form_is_pos_issue
[Fix] POS auto set paid amount with outstanding amount issue
|
2016-07-21 09:39:57 +05:30 |
|
Rushabh Mehta
|
5a39d41a0c
|
[redesign] replace document flow with dashboard, sorry @saurabh6790, fixes #5792
|
2016-07-20 22:53:23 +05:30 |
|
Rohit Waghchaure
|
61b4a43d84
|
[Fix] POS auto set paid amount with outstanding amount issue
|
2016-07-20 17:01:29 +05:30 |
|
Nabin Hait
|
3edefb19b9
|
Demo data for fixed asset depreciation
|
2016-07-20 16:14:30 +05:30 |
|
Rushabh Mehta
|
2f0dbd9bd8
|
[fix] test
|
2016-07-20 15:28:39 +05:30 |
|
Faris Ansari
|
8908d19bc9
|
[mobile ui] fix buttons
|
2016-07-20 14:00:08 +05:30 |
|
Nabin Hait
|
e2d0d7c5db
|
Merge pull request #5799 from nabinhait/fix104
Fixes
|
2016-07-20 12:38:49 +05:30 |
|
Rushabh Mehta
|
fc8e589295
|
[fix] party status updating bug, fixes #5794, #5796
|
2016-07-20 12:09:27 +05:30 |
|
Nabin Hait
|
85648d9bd6
|
payment entry fixes
|
2016-07-20 11:28:50 +05:30 |
|
Nabin Hait
|
b1234fa5e8
|
Set missing values in asset
|
2016-07-20 11:28:50 +05:30 |
|
Nabin Hait
|
df2a75ad1d
|
Updated standard chart of accounts
|
2016-07-20 11:27:58 +05:30 |
|
Rushabh Mehta
|
c0cc9902d9
|
Merge pull request #5776 from saurabh6790/warehouse_accounting_fix
[fix] for setting warehouse in account head
|
2016-07-19 21:35:09 +05:30 |
|
Rohit Waghchaure
|
88514a246b
|
set paid amount with grand amount on invoice form
|
2016-07-19 20:04:44 +05:30 |
|
Rushabh Mehta
|
02ba94784b
|
Merge pull request #5785 from rohitwaghchaure/batch_added_in_pos
[POS] Added batch and fixed issue of searching serial no #5779
|
2016-07-19 10:19:52 +05:30 |
|
Rushabh Mehta
|
6ecc0888ab
|
[minor] dont make tax template default, by default. #5695
|
2016-07-19 10:17:30 +05:30 |
|
Rohit Waghchaure
|
03da40ba4c
|
[Fix] Added batch in POS
|
2016-07-18 17:50:50 +05:30 |
|
Rushabh Mehta
|
5f9566f3af
|
[fix] text field for sales, purchase invoice advance fixes #5773
|
2016-07-18 14:44:12 +05:30 |
|
Rushabh Mehta
|
76b134192f
|
[fix] grid columns now restricted to 10
|
2016-07-18 14:30:27 +05:30 |
|
Nabin Hait
|
94105b04b8
|
Asset category mandatory validation while fetching item details
|
2016-07-16 11:20:50 +05:30 |
|
Saurabh
|
dcb41da02a
|
[fix] for setting warehouse in account head
|
2016-07-16 11:17:43 +05:30 |
|
Nabin Hait
|
96376b2345
|
Trigger receive/paid amount on change of paid from/to
|
2016-07-16 11:00:29 +05:30 |
|
Nabin Hait
|
6831b9422b
|
payment entry improvements and deletion of payment tool
|
2016-07-16 11:00:29 +05:30 |
|
Nabin Hait
|
4f5f8d7806
|
Set target exchange rate from source if currency is same
|
2016-07-16 10:59:48 +05:30 |
|
Rushabh Mehta
|
176b63b354
|
[fix] remove first row on mapping, fixes #5707
|
2016-07-14 17:43:48 +05:30 |
|
Rushabh Mehta
|
528e145a54
|
[docs] fixes #5697
|
2016-07-14 17:00:05 +05:30 |
|