Commit Graph

34076 Commits

Author SHA1 Message Date
Marica
71db253b86 Merge branch 'develop' into fix_title_customer_name 2020-10-07 20:27:32 +05:30
Abhishek Balam
ebf53a7f25 fix(HR): Appraisal form Enhancements (#23500)
* fix: remove total score button

* Removing conflicts
2020-10-07 19:59:26 +05:30
michellealva
3525ddabc5 fix: Add links in Stock desk page 2020-10-07 19:02:19 +05:30
barredterra
242579b77c fix: use party name as title 2020-10-07 14:34:21 +02:00
Marica
bd775cbf26 Merge pull request #23529 from michellealva/acocunts_settings_fix
fix: Typo in Accounts Settings
2020-10-07 15:22:15 +05:30
michellealva
a9c2401a2d fix: Typo in Accounts Setings 2020-10-07 15:13:57 +05:30
Saqib Ansari
96bd2f72d0 fix: fetch token if not valid 2020-10-07 14:33:38 +05:30
Abhishek Balam
937308854a Merge branch 'develop' into pricing_rule_on_condition 2020-10-07 13:35:53 +05:30
Saqib Ansari
fb33f7d3c3 chore: save signed invoice and qrcode after uplaoding irn 2020-10-07 11:29:10 +05:30
Saqib Ansari
5e0817f57a fix: fn name 2020-10-07 11:29:10 +05:30
Saqib Ansari
f6d23df826 chore: group e-invoicing actions 2020-10-07 11:29:10 +05:30
Saqib Ansari
499273e64a feat: manual download / upload json 2020-10-07 11:29:09 +05:30
Raffael Meyer
2acfc2a034 Merge branch 'develop' into validate_regional_germany 2020-10-06 16:53:52 +02:00
Deepesh Garg
b16e447f86 Merge pull request #23352 from deepeshgarg007/tax_fetch_quote
fix: Taxes not getting fetched from Opportunity to Quotation
2020-10-06 19:55:21 +05:30
michellealva
203585f292 fix(Employee): Field level change in Exit section 2020-10-06 16:00:39 +05:30
michellealva
2e425efae8 fix: blank option in the beginning 2020-10-06 15:15:29 +05:30
michellealva
a2aae5644e fix(Budget): Change options in select field 2020-10-06 15:02:01 +05:30
Mangesh-Khairnar
faa0cce7a7 fix: pass mobile number to generate the stk push 2020-10-06 13:58:54 +05:30
Deepesh Garg
f183dd6d3a Merge branch 'develop' into tax_fetch_quote 2020-10-06 13:27:28 +05:30
rohitwaghchaure
59ee417d31 Merge pull request #23483 from marination/item-attr
fix: Handle Blank from/to range in Numeric Item Attribute
2020-10-06 12:00:26 +05:30
Mangesh-Khairnar
862433febb fix: create custom field for mpesa receipt 2020-10-06 10:59:59 +05:30
Mangesh-Khairnar
8d54d61c28 fix: handle payment completion via payment request 2020-10-05 22:37:31 +05:30
Sun Howwrongbum
72a596971c fix: also update employee field when renamed (#23482) 2020-10-05 20:48:53 +05:30
rohitwaghchaure
bb61c77c6e Merge pull request #23514 from deepeshgarg007/batch_search_fix
fix: Condition in batch selector query
2020-10-05 16:05:52 +05:30
Deepesh Garg
f58a5ec6a5 fix: Codition in batch selector query 2020-10-05 13:55:53 +05:30
rohitwaghchaure
96fadb7c9b Merge pull request #23511 from marination/sales-order-project
fix: Show Project under Create button in SO
2020-10-05 13:17:48 +05:30
rohitwaghchaure
ad2dd6062e Merge pull request #23513 from deepeshgarg007/batch_search
fix: Search batches based on search fields
2020-10-05 13:16:03 +05:30
Deepesh Garg
1fae7749be fix: Search batches based on search fields 2020-10-05 12:38:54 +05:30
marination
e7af9ff999 fix: Show Project under Create button in SO 2020-10-05 12:24:43 +05:30
Saqib
2016a34e30 fix: naming series - cannot reset current value to zero (#23504) 2020-10-04 18:13:24 +05:30
Deepesh Garg
5bf35e465e Merge pull request #23220 from marination/account-add-rename
feat: Validate and Update Child Company Accounts on Rename/Adding Account
2020-10-04 15:19:26 +05:30
Mangesh-Khairnar
1bef6a530c fix: create payment entry against payment request 2020-10-04 13:01:11 +05:30
Deepesh Garg
f8bf139692 Merge pull request #23498 from aakvatech/patch-3
fix: get_outstanding_invoices not ignoring the cancelled transactions
2020-10-03 22:36:24 +05:30
Suraj Shetty
01e986b11c Merge pull request #23493 from frappe-pr-bot/translations-2020-10-03-develop
chore: Update translations
2020-10-03 22:17:18 +05:30
aakvatech
38ccf82604 fix: get_outstanding_invoices not ignoring the cancelled transactions
Added is_cancelled=0 in 2 places for get_outstanding_invoices
2020-10-03 19:41:38 +03:00
Suraj Shetty
5dc0432cff chore: Update translations 2020-10-03 08:52:07 +00:00
rohitwaghchaure
3c77a4697b Merge pull request #23471 from rohitwaghchaure/fixed-currency-issue-in-pl-report
fix: currency symbol in profit and loss report
2020-10-03 10:32:00 +05:30
Suraj Shetty
262590b672 Merge pull request #23481 from frappe-pr-bot/translations-2020-10-02-develop
chore: Update translations
2020-10-02 13:43:12 +05:30
marination
c213cd96c5 fix: Handle Blank from/to range in Numeric Item Attribute 2020-10-02 12:22:28 +05:30
marination
0bc61b31f7 chore: Move Qty fields (received qty,etc.) close to Qty/Stock UOM 2020-10-02 11:54:54 +05:30
Suraj Shetty
70c06512d2 chore: Update translations 2020-10-02 03:57:15 +00:00
marination
b9e2f17f4f fix: More secure query 2020-10-01 21:31:51 +05:30
marination
f57ba86bce chore: Add Date and Valid Till to List View 2020-10-01 21:10:00 +05:30
marination
5006345a0a chore: Fetch RFQs in Get Items from RFQ based on Supplier selected
- Rfq will appear only if selected supplier is in the RFQ
2020-10-01 20:41:05 +05:30
marination
4993ef19d6 feat: Supplier Quotation UX fixes 2020-10-01 16:35:09 +05:30
marination
29d7528a95 fix: Hide Preview Email button on submitted doc 2020-10-01 14:55:21 +05:30
Abhishek Balam
71c24c8a90 feat: add tests 2020-10-01 14:54:11 +05:30
marination
f90c3602a7 fix: Price should be total amount, modified deskpage 2020-10-01 14:38:17 +05:30
hasnain2808
f8db9582c3 feat(UAE VAT 21): Add currency formatting 2020-10-01 12:59:39 +05:30
hasnain2808
8cc6f2b388 feat(UAE VAT 21): add fixed width to columns 2020-10-01 12:44:39 +05:30