Commit Graph

13946 Commits

Author SHA1 Message Date
Nabin Hait
c5d41eb22a Merge pull request #4664 from saurabh6790/variant_fixes
[fixes] compare variants in lower case
2016-01-21 16:06:42 +05:30
Saurabh
47fd5e0ff0 [fixes] compare variants in lower case 2016-01-21 15:46:55 +05:30
Nabin Hait
bb7e499cbd Merge pull request #4662 from ccfiel/develop
undo reconciled journal entry record
2016-01-21 15:32:33 +05:30
Chris Ian Fiel
cb66d3a8c9 undo reconciled journal entry record
https://github.com/frappe/erpnext/issues/4661
2016-01-21 16:26:22 +08:00
Chris Ian Fiel
43a62ad0f0 undo reconciled journal entry record 2016-01-21 06:50:13 +08:00
Nabin Hait
e6b52bbb43 Update create_manufacturer_records.py 2016-01-21 00:30:39 +05:30
Nabin Hait
6811e73b53 Merge pull request #4658 from umairsy/20-jan
Updated articles in Buying
2016-01-20 22:28:50 +05:30
Umair Sayyed
5cd9193a2b Updated articles in Buying 2016-01-20 18:47:33 +05:30
Nabin Hait
a613ea8abf [patch] Create manufacturer records 2016-01-20 18:32:37 +05:30
Dominik
d737390b80 Changed Manufacturer from Data to its own DocType, copied most of the logic from Customer but used short_name for namig series. 2016-01-20 18:32:37 +05:30
Nabin Hait
20bf7375f4 Merge pull request #4655 from nabinhait/rounding_issue
Rounding based on smallest circulating currency fraction value
2016-01-20 18:12:36 +05:30
Nabin Hait
fb0b24af78 Rounding based on smallest circulating currency fraction value 2016-01-20 17:07:35 +05:30
Nabin Hait
002fa6c1d9 Merge pull request #4650 from RicardoJohann/patch-2
Accounts - Bank reconciliation - Workflow and labeling improvements
2016-01-20 17:03:06 +05:30
Nabin Hait
dbbc3eb8a6 Merge pull request #4656 from nabinhait/gle_rounding
[fix] Round off gle due to currency conversion
2016-01-20 16:48:42 +05:30
Nabin Hait
c2c9124af8 Merge pull request #4643 from nabinhait/status_button
[fix] Close button visible in all sumitted PR and DN
2016-01-20 16:47:17 +05:30
Nabin Hait
5b19aeecb4 Merge pull request #4642 from nabinhait/return_fix1
[fix] Accept return items in any warehouse
2016-01-20 16:46:33 +05:30
Nabin Hait
dd2f0330a6 Merge pull request #4641 from nabinhait/report-currency
[fix] Currency in Gross Profit report
2016-01-20 16:45:57 +05:30
Nabin Hait
61673aafd4 Merge pull request #4640 from nabinhait/fix50
Fixes
2016-01-20 16:35:46 +05:30
Nabin Hait
d4507ac6a0 [fix] Round off gle due to currency conversion 2016-01-20 16:14:27 +05:30
Nabin Hait
7c8dc38f15 Merge pull request #4654 from agusputra/patch-1
Update adding-users.md
2016-01-20 14:43:14 +05:30
Agus Syahputra
aa8745378a Update adding-users.md 2016-01-20 15:45:16 +07:00
Nabin Hait
2b986d3b02 Merge pull request #4651 from RicardoJohann/patch-4
Update queries.py - Added item_group
2016-01-20 13:11:44 +05:30
RicardoJohann
3fb5340188 Update queries.py 2016-01-20 14:32:59 +08:00
RicardoJohann
05aa3b391e Update bank_reconciliation.py 2016-01-20 13:38:20 +08:00
RicardoJohann
e095eeb084 Update bank_reconciliation_statement.py 2016-01-20 13:36:36 +08:00
Rushabh Mehta
7633aca7c1 Merge pull request #4645 from umairsy/16-jan
updated stock articles
2016-01-20 10:27:24 +05:30
RicardoJohann
6f9afffd8a Update bank_reconciliation_statement.html 2016-01-20 12:15:20 +08:00
RicardoJohann
7425af6968 Update bank_reconciliation_detail.json
Accounts - Bank reconciliation - Workflow and labeling improvements
2016-01-20 12:02:20 +08:00
Umair Sayyed
de15a26cab updated stock articles 2016-01-19 18:39:27 +05:30
Nabin Hait
5ac22ce6a1 [fix] Close button visible in all sumitted PR and DN 2016-01-19 18:30:02 +05:30
Nabin Hait
20105d8a0d [fix] Accept return items in any warehouse 2016-01-19 18:05:28 +05:30
Nabin Hait
6d8688f8b4 [fix] Currency in Gross Profit report 2016-01-19 17:27:06 +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
Nabin Hait
787e59c37e [fix] BOM Autonaming 2016-01-19 16:48:31 +05:30
Nabin Hait
77532cc8db [fix] Total Amount in Journal Entry 2016-01-19 16:48:31 +05:30
Rushabh Mehta
c978b9c36a [minor] [fix] in Item > Add / Edit Prices, go to list view instead of report, fixes #4639 2016-01-19 16:34:49 +05:30
Nabin Hait
31608a82f8 Merge pull request #4632 from nabinhait/pos_fix
Calculate change in POS based on smallest currency fraction value
2016-01-19 11:46:13 +05:30
Nabin Hait
4f0bfcd287 Merge pull request #4621 from neilLasrado/develop
Fixed time log overlap validation. Fixed test case in time log
2016-01-19 11:13:00 +05:30
Rushabh Mehta
54673f8d1d Merge pull request #4635 from MaxMorais/patch-2
Add localization in the on_submit event
2016-01-19 10:45:51 +05:30
Maxwell
4da17348fd Add localization in the on_submit event 2016-01-18 23:29:21 -02:00
Rushabh Mehta
aee26219ed [fix] get warehouse details on selection 2016-01-18 18:57:49 +05:30
Nabin Hait
8b63b1221f Calculate change in POS based on smallest currency fraction value 2016-01-18 17:56:55 +05:30
Rushabh Mehta
6bf3c7453b [fix] payment request 2016-01-18 14:29:26 +05:30
Rushabh Mehta
681c9dde84 [ui] payment request cleanup 2016-01-18 14:21:45 +05:30
Rushabh Mehta
34fb5cf0e2 [fix] make setup_wizard.create_bank_account multi-company safe 2016-01-18 12:35:24 +05:30
Rushabh Mehta
0e2f9ee44c [docs] fix 2016-01-18 12:35:24 +05:30
Anand Doshi
0bcd9efa88 [fix] value returned by frappe._ will always be unicode 2016-01-18 12:30:31 +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
Neil Trini Lasrado
329e7783bc Fixed time log overlap validation. Fixed test case in time log 2016-01-15 16:34:06 +05:30