Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,371 Commits 3 Branches 0 Tags 1 GiB
86e03325c3
Commit Graph

33371 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nabin Hait
b7285fdcad
Merge branch 'develop' into prod-plan-status 2020-10-29 18:58:32 +05:30
Nabin Hait
2bb110b3d1
Merge branch 'develop' into fix-po-no-fetching 2020-10-29 18:57:33 +05:30
Marica
8f6bd851d3
chore: Show Toast alert feedback on Scanning Barcode (#23760) 2020-10-29 18:55:52 +05:30
Marica
bf54ea9976
chore: (Production Plan) Simplify and fix translation in message popup (#23753) 2020-10-29 18:54:36 +05:30
rohitwaghchaure
d0c2700c85
fix: subscription test case (#23763) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-10-29 18:52:16 +05:30
Saqib
b193731158
fix: pos profile has no attr 'show_only_available_items' (#23758) 2020-10-29 13:23:50 +05:30
Marica
1b8a1cfed2
Merge branch 'develop' into prod-plan-status 2020-10-29 13:02:19 +05:30
Mohammad Hasnain Mohsin Rajan
55c78b17ba
fix(UAE VAT 201): change desk page record 2020-10-29 12:43:43 +05:30
Kenneth Sequeira
10f2468076
fix: make asset dashboard charts public (#23751) 2020-10-29 12:02:48 +05:30
Syed Mujeer Hashmi
c17cdd7c2e
fix: Fix for LMS Sign Up link (#23743) 
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>

Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-10-29 11:10:06 +05:30
Mohammad Hasnain
eb3084b072 refactor(UAE VAT 201): break functions 2020-10-29 09:52:17 +05:30
Mohammad Hasnain
bf261a6c39 fix(UAE VAT 201): fix helper 2020-10-29 00:07:52 +05:30
Mohammad Hasnain
08846f6b11 refactor(UAE VAT 201): replace cartesian product to inner joins 2020-10-28 23:33:56 +05:30
Mohammad Hasnain
2c00549dfe refactor(UAE VAT 201): Use frappe api instead sql 2020-10-28 22:54:56 +05:30
Deepesh Garg
ae6a51b83a
Merge pull request #23749 from deepeshgarg007/accounting_dimension_gl_fix 
fix: Do not allow Company as accounting dimension
 2020-10-28 22:05:11 +05:30
Mohammad Hasnain Mohsin Rajan
6e9e6d2491
Merge branch 'develop' into UAE-VAT-Format 2020-10-28 21:06:11 +05:30
Rohit Waghchaure
0fa741b267 added test cases 2020-10-28 17:43:36 +05:30
Deepesh Garg
94a630c255 fix: Do not allow Company as accounting dimension 2020-10-28 17:15:14 +05:30
Saqib
a51d9e3259
fix: pos register shows cancelled documents (#23747) 2020-10-28 17:08:47 +05:30
Saqib
7d9dd3c628
fix: item wise tax calculation (#23744) 2020-10-28 17:07:10 +05:30
Rohit Waghchaure
a248dfb9a5 fix: multiple pricing rules are not working on selling side 2020-10-28 16:22:49 +05:30
Deepesh Garg
c9a6135d6c fix: Interest accrual after loan topup 2020-10-28 13:38:15 +05:30
Rushabh Mehta
1dd54e457d
Merge pull request #23734 from rmehta/quality-form-cleanup 
fix(cleanup): Quality Module, cleanup of forms, dashboards etc.
 2020-10-28 11:36:00 +05:30
Mohammad Hasnain
81f2efd9b0 chore(UAE VAT 201): Rename emirate to vat emirate 2020-10-28 10:28:25 +05:30
Marica
4326d21a79
Merge branch 'develop' into purchase-invoice-payment-terms 2020-10-27 18:40:20 +05:30
Rushabh Mehta
12a2e51e20 fix(minor): translation string encoding in quality_procedure.py 2020-10-27 18:38:44 +05:30
Rushabh Mehta
cf1428904a fix(refactor): refactor tests, client side code 2020-10-27 17:36:30 +05:30
marination
67f2c82d90 chore: Test case for Payment Terms in PI from PR 2020-10-27 14:49:43 +05:30
Deepesh Garg
0db4d91c30
Merge pull request #23550 from nextchamp-saqib/add-acc-to-a-group-fix 
chore: validate is_group of child parent account
 2020-10-27 13:54:17 +05:30
marination
fa085d7f4b fix: Payment Terms not fetched in Purchase Invoice from Purchase Receipt 2020-10-27 13:18:30 +05:30
Afshan
0a6e1b3503 fix: refactor 2020-10-26 21:23:31 +05:30
Afshan
bd987e56bc
fix: showing error for wrong filters. (#23726) 
* fix: showing error for wrong filters.

* style: formatting translation
 2020-10-26 19:37:33 +05:30
Saqib
fa5fe18b70
fix error message 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2020-10-26 19:27:02 +05:30
Deepesh Garg
13f4b3fc17 fix: Translation syntax 2020-10-26 19:01:36 +05:30
Deepesh Garg
a630de56e9 fix: Loan disbursement amount validation check 2020-10-26 18:53:56 +05:30
Deepesh Garg
64a4437b48
Merge branch 'develop' into add-acc-to-a-group-fix 2020-10-26 18:41:32 +05:30
Afshan
3f971b2371 fix: copying po no when mapping doc 2020-10-26 16:59:57 +05:30
Deepesh Garg
5b4742fd25 fix: Permission fixes for some doctypes 2020-10-26 16:56:05 +05:30
marination
689b77d1ed fix: Don't show buttons if status is Completed 2020-10-26 16:28:39 +05:30
Rushabh Mehta
ea49e30bfd fix(cleanup): cleaned up forms 2020-10-26 15:30:52 +05:30
marination
097b32fe67 feat: Close Production Plan 2020-10-26 15:27:37 +05:30
Deepesh Garg
d63fbd79f4 fix: Unaccrued interest from last accrual date instead of disbursement date 2020-10-26 14:20:55 +05:30
rohitwaghchaure
8ba05dc674
Merge branch 'develop' into skip-non-apply-tds-invoices-develop 2020-10-26 14:11:34 +05:30
rohitwaghchaure
8c961938ac
Merge pull request #23662 from rohitwaghchaure/backport-subcontracting-issues 
fix: multiple subcontracting issues
 2020-10-26 14:10:50 +05:30
Rohit Waghchaure
103ecec9d4 fixed translation syntax 2020-10-26 12:20:11 +05:30
Rohit Waghchaure
9caac6976c fix: incorrect supplied qty error 2020-10-26 12:19:00 +05:30
Rohit Waghchaure
538d62b43d fix: incorrect consumed qty if raw material with batch 2020-10-26 12:19:00 +05:30
rohitwaghchaure
4c688b71f3 fix: consumed qty logic for subcontracted raw materials (#23314) 
* fix: consumed qty logic for subcontracted raw materials

* added test case

* fix: sales order workflow test case
 2020-10-26 12:19:00 +05:30
rohitwaghchaure
1cfa61628d fix: incorrect calculation for consumed qty for subcontract item (#23257) 
* fix: incorrect calculation for consumed qty for subcontract item

* added test case
 2020-10-26 12:19:00 +05:30
Saqib
60212ff9b9
fix: multiple pos issues (#23347) 
* fix: point of sale search

* fix: pos fetches expired serial nos

* fix: pos doesn't refresh on route change

* fix: opening balances not set in opening entry

* fix: remove debug statement

* fix: invalid query if no serial no is reserved by pos invoice

* chore: make new order btn primary

* chore: filter warehouse by company

* chore: add shortcuts for new order and email

* fix: cannot fetch serial no if no batch control

* chore: add shortcuts for menu items

* feat: standard keyboard shortcuts for pos page

* feat: display only items that are in stock

* fix: empty point of sale page if opening entry dialog is closed

* feat: conversion factor in pos item details

* fix: show all invalid mode of payments

* chore: show all items if allow negative stock is checked

* fix: -ve amount set when changing mode of payment

* fix: pos closing validations

* fix: test

* fix: non expired serial no fetching query

* fix: cannot dismiss pos opening creation dialog

* fix: transalation strings

* fix: msgprint to throw

* chore: use as_list in frappe.throw

* chore: clean up pos invoice.js & .py

* fix: codacy

* fix: transalation syntax

* fix: codacy

* fix: set_missing_values called twice from pos page

* fix: mode selector with double spaces

* fix: do not allow tables in pos additional fields

* fix: pos is not defined

* feat: set mode of payments for returns

* fix: remove naming series from pos profile

* fix: error message

* fix: minor bugs

* chore: re-arrange pos closing entry detail fields

* fix: sider & frappe linter

* fix: more translation strings

* fix: travis

* fix: more translation strings

* fix: sider

* fix: travis

* fix: unexpected end of string

* fix: travis

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-26 11:17:04 +05:30