Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,527 Commits 3 Branches 0 Tags 1 GiB
b1997da488
Commit Graph

34527 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Prssanna Desai
e60a62bde5
fix: function imports in account_balance_timeline.py (#24003) 2020-11-25 15:37:02 +05:30
Mohammad Hasnain Mohsin Rajan
e15b6a91de
Filters for tax templates (#23998) 
* feat: add company filter to tax templates

* fix: remove filer from PO because it is from tran

* fix: linting

* fix: solve translation string issues

* fix: remove doctype name
 2020-11-25 15:36:41 +05:30
Anurag Mishra
7824e81298 fix: ignore exception during leave ledger creation from patch 2020-11-25 14:54:50 +05:30
Deepesh Garg
1a4390de44 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2020-11-25 14:51:11 +05:30
Deepesh Garg
6b9dda5f3e fix: Move filter setup to doctype controllers 2020-11-25 14:49:10 +05:30
Deepesh Garg
92b3449789 fix: Label changes 2020-11-25 14:01:57 +05:30
Deepesh Garg
4e991fe668 fix: Define specific exceptions and fix tests 2020-11-25 13:46:07 +05:30
Deepesh Garg
df065f7044 fix: form layout and naming fixes 2020-11-25 13:44:52 +05:30
Deepesh Garg
6c17b84cae fix: Replace raw query with ORM 2020-11-25 13:42:16 +05:30
Marica
df17b4ff83
Merge branch 'develop' into pr-dn-return 2020-11-25 10:43:55 +05:30
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
marination
2ed80656aa chore: Code Cleanup 
- Validate capacity < stock level only on new rule
- Mention stock uom while validating capacity in new rule
- Separate function to format and display unassigned items
- Format ORM args
 2020-11-24 21:07:56 +05:30
marination
2fbaa5dc58 Merge branch 'putaway' of https://github.com/marination/erpnext into putaway 2020-11-24 17:39:19 +05:30
marination
68a49efc80 chore: Added Putaway Rule to Desk Page and added Priority to List View 2020-11-24 17:38:34 +05:30
Marica
e762bc67eb
Merge branch 'develop' into putaway 2020-11-24 17:28:34 +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
Krushnal Patel
e09037ed2c
docs: README build status badge (#23933) 
* fixed build status badge

* changed build branch from `master` to `develop`

* updated build status badge url

* Update README.md
 2020-11-24 12:53:30 +05:30
marination
ccbd432b56 chore: Added Tests 
- Fixed Sider Issues
- Added perms to Putaway Rule
- Added Unit Tests to check warehouse assignment
 2020-11-24 12:47:13 +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
marination
0cec1477f2 chore: Format unassigned Items dialog and add freeze message 2020-11-23 19:19:35 +05:30
marination
90598ea19c chore: Multi UOM support for Putaway 
- Added UOM & conversion factor field in Putaway Rule
- Items are split and assigned as per UOM
- Handled Whole UOMs too
 2020-11-23 17:35:13 +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
marination
9596276b95 fix: Linter and Sider 2020-11-23 10:32:17 +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
Saurabh
3a251ecb26 Merge branch 'version-13-beta-pre-release' into version-13-beta 2020-11-20 15:02:00 +05:30
Saurabh
ecc50c8c24 bumped to version 13.0.0-beta.6 2020-11-20 15:22:00 +05:50
rohitwaghchaure
2d21473e61
Merge pull request #23970 from rohitwaghchaure/incorrect-delink-serial-no-and-batch-v13-pre-release 
fix: incorrect delink serial no and batch
 2020-11-20 14:30:27 +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
Rohit Waghchaure
0b71801462 fix: incorrect delink serial no and batch 2020-11-20 12:59:00 +05:30
marination
c7991f8561 feat: Putaway Rule 2020-11-20 11:53:20 +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