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

24435 Commits

Author SHA1 Message Date
Rucha Mahabal
6b57cf3285
feat: Quality Inspection on Job Card (#23964) 
* feat: Quality Inspection on Job Card

* fix(Job Card): quality inspection filter query

* fix: sider issues
 2020-11-25 09:17:16 +05:30
Nabin Hait
0508e6bdfa
fix: Added link of bank reconciliation and clearance in accounting desk page (#23809) 2020-11-25 09:16:12 +05:30
Raffael Meyer
fbcc3c1b70
fix: Translatable strings (#23783) 
* fix: start_pattern

* fix: translatable strings

* fix: add missing semicolon (task)

* fix: add missing semicolon (setup_wizard)

* fix: text should start on the same line

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* fix: move out HTML element as variable

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* fix: pull out message, translate "Undo".

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* fix: typo

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* fix: text should start on the same line

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* Revert "fix: start_pattern"

This reverts commit decc62e2ab75f45db1df022fe13780c2d0d2560d.

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-11-25 09:11:51 +05:30
Rucha Mahabal
c66bd45ba4
feat: Inpatient Medication Orders Script Report (#23984) 
* feat: Inpatient Medication Orders Script Report

* feat: add chart for Inpatient Medication Order Report

* feat: add report to Desk Page

* feat: added filters for dates and healthcare service unit

* test: Inpatient Medication Orders report
 2020-11-25 09:09:40 +05:30
Deepesh Garg
a339752ba4
fix: Loan disbursement amount validation (#24000) 2020-11-25 08:54:51 +05:30
Mohammad Hasnain Mohsin Rajan
e4755828c4
fix: template errors in pricing rule (#23999) 
* fix: solve microtemplating errors
 2020-11-24 23:31:06 +05:30
rohitwaghchaure
f38abdeac0
Merge pull request #23994 from rohitwaghchaure/bom-stock-project-item-color-develop 
fix: bom stock report color showing always red
 2020-11-24 21:16:51 +05:30
rohitwaghchaure
5ab2e6c1ff
Merge pull request #23991 from pateljannat/job-card-operation-field-error 
fix: job card error handling for operations field
 2020-11-24 17:05:44 +05:30
Rohit Waghchaure
5a33f2c394 fix: bom stock report color showing always red 2020-11-24 16:59:36 +05:30
rohitwaghchaure
ccd554c19c
Merge pull request #23989 from Anurag810/item-maintain-stock-fixes 
fix: maintain stock can't be changed it there is product bundle
 2020-11-24 15:57:01 +05:30
pateljannat
b67ebc7636 fix: job card error handling for operations field 2020-11-24 15:37:30 +05:30
Deepesh Garg
d39ebf248e
Merge pull request #23990 from deepeshgarg007/shopify_order_id_sync 
fix: Old shopify order syncing date
 2020-11-24 15:12:53 +05:30
Deepesh Garg
43a830f3f5 fix: Old shopify order syncing date 2020-11-24 15:10:36 +05:30
Anurag Mishra
927106f552 fix: maintain stock can't be changed it there is product bundle 2020-11-24 15:02:52 +05:30
Deepesh Garg
d07447aa5f
fix: Validation for duplicate Tax Category (#23978) 
* fix: Validation for duplicate Tax Category

* Update utils.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-11-24 08:09:17 +05:30
Afshan
6aa6ec1832
fix: clear error message when approval not available (#23971) 2020-11-24 08:01:19 +05:30
rohitwaghchaure
b9b8a13393
Merge pull request #23980 from rohitwaghchaure/color-not-showing-in-bom-stock-report-develop 
fix: bom stock report color issue
 2020-11-23 16:43:32 +05:30
Rucha Mahabal
9a73a67dcd
Merge pull request #23982 from pateljannat/track-changes-in-stock-settings 
fix: enabling track changes for stock settings
 2020-11-23 15:57:48 +05:30
rohitwaghchaure
f9a44000d9
Update bom_stock_report.js 2020-11-23 15:40:06 +05:30
pateljannat
34f381df17 fix: enabling track changes for stock settings 2020-11-23 15:31:08 +05:30
Rohit Waghchaure
610d9ca649 fix: bom stock report color issue 2020-11-23 14:10:55 +05:30
Deepesh Garg
20d6143c38 fix: Validation for journal entry with 0 debit and credit values 2020-11-21 12:09:11 +05:30
Jannat Patel
34d07b6306
fix: purchase receipt to purchase invoice bill date mapping (#23967) 
Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
 2020-11-20 19:22:35 +05:30
rohitwaghchaure
6b53ef7cce
Merge pull request #23947 from rohitwaghchaure/incorrect-delink-serial-no-and-batch 
fix: incorrect delink serial no and batch
 2020-11-20 13:45:17 +05:30
Deepesh Garg
06e16eb748
Merge pull request #23941 from pateljannat/place-of-supply-change-issue 
fix: place of supply change on address change
 2020-11-20 11:13:19 +05:30
Rohit Waghchaure
ceab692f73 fix: incorrect delink serial no and batch 2020-11-20 00:25:03 +05:30
pateljannat
1d5d863e9a fix: removing return_taxes condition 2020-11-19 20:11:45 +05:30
Rohit Waghchaure
f0b1670abc fix: tds test case 2020-11-19 18:40:13 +05:30
Jannat Patel
c1187bc1d5
fix: duplicate items validation for POS Invoice when allow multiple items is disabled (#23896) 
* fix: duplicate items validation for POS when allow multiple items in disabled

* fix: variable name change for duplicate item validation

Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
 2020-11-19 13:10:24 +05:30
pateljannat
cd05b34691 fix: company filter added again 2020-11-19 11:37:08 +05:30
Deepesh Garg
dd7a6d948c
Merge pull request #23672 from rohitwaghchaure/skip-non-apply-tds-invoices-develop 
fix: tds calculation, skip invoices with "Apply Tax Withholding Amount" has disabled
 2020-11-19 11:27:38 +05:30
Deepesh Garg
ebdc8cee5b
Merge pull request #23825 from igormbq/fix-demo 
fix: location data on Asset to use command(make_demo)
 2020-11-19 11:26:12 +05:30
Rucha Mahabal
14514f776b
fix: Enable Allow Auto Repeat for standard doctypes having auto_repeat field (#23776) 
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
 2020-11-19 08:17:16 +05:30
Marica
6dafe1eabf
feat: Formula based Quality Inspection (#23916) 
* feat: Formula based Quality Inspection

* chore: Added Test for Formula Based QI reading
 2020-11-19 08:12:58 +05:30
rohitwaghchaure
6e974bf246
Merge pull request #23949 from pateljannat/email-digest-user-not-found-issue 
fix: email digest user not found
 2020-11-18 23:54:34 +05:30
Smit Vora
bbe4933a52 fix(regional): set proper state code in ewaybill JSON when gst_category is SEZ 2020-11-18 21:00:09 +05:30
pateljannat
188657d05a fix: email digest user not found 2020-11-18 17:15:54 +05:30
rohitwaghchaure
67ba0462e9
Merge pull request #23408 from kevingdc/fix/item-price-duplicate-checking 
fix: Item price duplicate checking
 2020-11-18 16:41:48 +05:30
pateljannat
410db04b48 fix: linter issue for translation syntax 2020-11-18 15:57:16 +05:30
Deepesh Garg
a0b17c4ef6
Merge pull request #23836 from pateljannat/purchase-taxes-and-charges-account-name-issue 
fix: correcting description field in taxes and charges for accounts with account number + account name
 2020-11-18 15:31:25 +05:30
Deepesh Garg
81f6ef3e1a
Merge pull request #23934 from Anurag810/memebership-fixes 
fix: validation for membership
 2020-11-18 15:25:24 +05:30
Deepesh Garg
f0187f6db2
Merge pull request #23447 from hasnain2808/UAE-VAT-Format 
feat: UAE VAT 201 Report
 2020-11-18 15:15:00 +05:30
pateljannat
d0c528143f Merge branch 'place-of-supply-change-issue' of https://github.com/pateljannat/erpnext into place-of-supply-change-issue 2020-11-18 12:52:24 +05:30
pateljannat
8c9b60edfe fix: reversing previous commits and adding condition in regional controller 2020-11-18 12:51:13 +05:30
Saqib
d82b76fe0a
fix: pos item search includes non stock items (#23914) 
* fix: pos item search includes non stock items

* chore: add validation for non stock items
 2020-11-18 11:56:49 +05:30
Jannat Patel
96a0c17626
Merge branch 'develop' into place-of-supply-change-issue 2020-11-18 10:27:20 +05:30
Deepesh Garg
69232f8dd1 fix: Loan application link on creating loan 2020-11-17 22:00:41 +05:30
pateljannat
6b10d87d46 fix: place of supply change on address change 2020-11-17 20:34:51 +05:30
Anurag Mishra
3271437314
fix: Handle for custom field IFSC code in Bank remittance report. (#23905) 
* fix: Handel for custom field IFSC code

* fix: changes_requested
 2020-11-17 17:52:59 +05:30
Anurag Mishra
a77f2ba0de fix: validation for membership 2020-11-17 15:34:05 +05:30
rohitwaghchaure
7aa60d1dea
fix: stock ageing report not working (#23923) 2020-11-17 12:10:27 +05:30
Afshan
c72b693223
fix: Handle the "no leave_allocation found" case (#23922) 
* fix: Handle the "no leave_allocation found" case

* fix: format of error msg
 2020-11-17 12:08:31 +05:30
Marica
23614b650e
fix: Don't copy terms and discount from SO to PO (#23903) 
* fix: Dont copy terms, discount and required by from SO to PO

* fix: Let delivery date and required by date get mapped
 2020-11-17 11:12:31 +05:30
Suraj Shetty
5e8b00207b
fix: Typo (Enchashment > Encashment) (#23919) 2020-11-17 10:58:09 +05:30
pateljannat
642819b955 fix: place of supply change when address changes 2020-11-17 09:47:10 +05:30
Mohammad Hasnain
d2477e6cc5 fix(UAE VAT 201): remove branch parts 2020-11-16 18:47:05 +05:30
Mohammad Hasnain
2e1787300d feat(UAE VAT 201): emirate according to branch 2020-11-16 17:36:27 +05:30
Anurag Mishra
d6e6c51f37
Merge branch 'develop' into salary_slip_fixes 2020-11-16 15:56:22 +05:30
Anurag Mishra
17d5ce3e41
fix: payroll attendance error (#23887) 
* fix: payroll attendance error

* fix: change query to frappe.get_all
 2020-11-16 14:20:18 +05:30
Mohammad Hasnain
b8d0b546a7 feat(UAE VAT Format): use company address for emir 2020-11-16 12:58:38 +05:30
rohitwaghchaure
6094d66a6d
Merge pull request #23636 from marination/item-price-pricing-rule-conflict 
fix: Dont overrule Item Price via Pricing Rule Rate if 0
 2020-11-16 12:22:30 +05:30
Anurag Mishra
69be37f88d
fix: Error handling in Upload Attendance (#23907) 2020-11-15 11:14:35 +05:30
Raffael Meyer
7178df8567
fix: improve UX of DATEV report (#23892) 
* feat(DATEV Settings): button to show report

* feat(desk): add DATEV to Reports under Accounting

* fix(report DATEV): last calendar month as default

* fix: let user create DATEV Settings

(Instead of showing an error message.)
 2020-11-15 09:45:10 +05:30
Kenneth Sequeira
c5966d3d70
fix: make contract template editable (#23891) 2020-11-15 09:44:36 +05:30
rohitwaghchaure
1c8c1d78e9
fix: default cost center in item master not set in stock entry (#23877) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-11-15 09:40:44 +05:30
Raffael Meyer
8ff0d0cff6
feat: make account number length configurable (#23845) 2020-11-15 09:34:05 +05:30
Raffael Meyer
4bf09dd02b
fix: fiscal year can be shorter than 12 months (#23838) 
* fix: replace unnecessary SQL query

* feat: checkbox "Is Short Year"

Also, set checkbox and dates only once.

* fix: toggle no longer necessary

Date fields use set_only_once.

* feat: short years can be less than 12 months

* fix: if short year, don't add 12 months to start date

* test: short year

* fix: move short fiscal year to test records
 2020-11-15 09:32:24 +05:30
Marica
188ecd7b39
chore: PO cleanup (#23774) 
* chore: Subcontracting section and items section enhancement

- Set target warehouse moved to Items section
- Added subcontraction label to supply RM section

* chore: PO & PO Item Form Cleanup

* chore: PO Get Items from cleanup

* fix: Taxes and Charges field visibility

* chore: Cleanup

* fix: Translation styling
 2020-11-15 09:17:42 +05:30
rohitwaghchaure
a8eedb057b
Merge pull request #23910 from rohitwaghchaure/not-able-to-save-bom 
fix: not able to save bom
 2020-11-14 07:12:22 +05:30
Rohit Waghchaure
4abc5657ab fix: not able to save bom 2020-11-13 22:18:48 +05:30
Afshan
3e7f7e3374 Merge branch 'fix-payroll-attendance' of https://github.com/AfshanKhan/erpnext into fix-payroll-attendance 
Merge branch 'fix-payroll-attendance' of https://github.com/AfshanKhan/erpnext into fix-payroll-attendance
 2020-11-13 17:04:18 +05:30
Afshan
1a4cafb97d fix: change query to frappe.get_all 2020-11-13 17:04:05 +05:30
Deepesh Garg
37dc369af9
feat: Sync old shopify orders (#23841) 
* feat: Sync old shopify orders

* fix: Old orders syncing by date

* fix: Remove unnecessary code

* fix: Remove unintentional changes

Co-authored-by: Saurabh <saurabh@erpnext.com>
 2020-11-13 16:53:35 +05:30
Afshan
5cffb6c72f
Merge branch 'develop' into fix-payroll-attendance 2020-11-13 13:01:51 +05:30
Anurag Mishra
2f5d896f8c fix: added wrong absent days calculation in salary slip 2020-11-12 16:57:42 +05:30
Jannat Patel
0ea0a7495c
fix: making company address read-only in delivery note (#23890) 2020-11-12 11:10:59 +05:30
Rucha Mahabal
159d3bf14b
Merge branch 'develop' into production-planning-status-filter 2020-11-11 22:36:21 +05:30
Deepesh Garg
5e0f4e2f4b
Merge pull request #23582 from deepeshgarg007/loan_repayment_type_remove 
fix: Loan repayment type option remove
 2020-11-11 22:08:41 +05:30
Marica
a8ac101f5c
Merge branch 'develop' into fix-po-no-fetching 2020-11-11 16:55:13 +05:30
Jannat Patel
a9e02bba77
Merge branch 'develop' into purchase-taxes-and-charges-account-name-issue 2020-11-11 16:46:01 +05:30
Mangesh-Khairnar
a91b68c868
feat: add communication channel to communication medium (#23793) 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-11-11 16:34:43 +05:30
Afshan
6c95bc5e11 fix: payroll attendance error 2020-11-11 15:13:38 +05:30
Marica
78cccbe015
Merge branch 'develop' into fix-po-no-fetching 2020-11-11 12:18:14 +05:30
Rushabh Mehta
780b6b466b fix(hooks): include js/css with full path 2020-11-11 11:44:28 +05:30
Marica
2b44f22cf4
Merge branch 'develop' into fix-po-no-fetching 2020-11-11 11:10:34 +05:30
Jannat Patel
e008f85816
Merge branch 'develop' into production-planning-status-filter 2020-11-11 10:00:39 +05:30
pateljannat
7e4d115e36 fix: sider issues fixed 2020-11-11 09:52:27 +05:30
pateljannat
b648b9cf93 fix: code review changes 2020-11-10 18:50:02 +05:30
pateljannat
d08c91673a fix: removed unnecessary filter options 2020-11-10 18:04:30 +05:30
Deepesh Garg
101bad3ea1 fix: Remarks for penalty GL Entry 2020-11-10 17:53:50 +05:30
Afshan
1e564bc02d fix: refactor 2020-11-10 13:23:59 +05:30
Afshan
a75708b02e Merge branch 'fix-po-no-fetching' of https://github.com/AfshanKhan/erpnext into fix-po-no-fetching 2020-11-10 13:19:53 +05:30
Afshan
1924019531 fix: refactor 2020-11-10 13:19:21 +05:30
Mohammad Hasnain Mohsin Rajan
72adb0b218
Merge branch 'develop' into UAE-VAT-Format 2020-11-10 09:58:45 +05:30
Raffael Meyer
57ce0462d9
fix: remove check for exempt_from_sales_tax 2020-11-09 19:04:46 +01:00
Anurag Mishra
91fdb7aa69
feat: added column cost_center to receivable reports (#23835) 2020-11-09 20:20:05 +05:30
Raffael Meyer
4f880e7454
refactor: zip_and_download (#23844) 2020-11-09 20:17:56 +05:30
Shivam Mishra
f38a1c305e
refactor: show form buttons only if permissions exist (#23851) 
* refactor: show form buttons only if permissions exist

* style: add semicolon

* fix: typo in conditions
 2020-11-09 20:16:28 +05:30
Deepesh Garg
8cfb210dc4
fix: Ignore doctypes on company transaction deleted (#23864) 2020-11-09 20:14:53 +05:30
UrvashiKishnani
bc64f5dfbb
fix: spelling error in filter label (#23867) 2020-11-09 20:14:06 +05:30