Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,733 Commits 3 Branches 0 Tags 1 GiB
242242c43f
Commit Graph

35733 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
8a01dbe8e1
Merge pull request #25261 from ankush/issue_status_banner_fix 
fix: condition for SLA status banner
 2021-04-10 17:56:51 +05:30
Rohit Waghchaure
1db8c51749 fix: changed logic 2021-04-10 10:45:29 +05:30
Rohit Waghchaure
b9aa775f3b fix: pricing_rule test cases 2021-04-10 10:45:28 +05:30
Rohit Waghchaure
1358443cdb fix: patch 2021-04-10 10:42:08 +05:30
Deepesh Garg
c85c243f9c
Merge pull request #25255 from nextchamp-saqib/issue-condition-fix 
fix: condition for setting agreement status
 2021-04-09 21:40:14 +05:30
Deepesh Garg
df9388aa8e
Merge pull request #25086 from deepeshgarg007/advance_amount_precision 
fix: Precision issues while allocating advance amount
 2021-04-09 21:39:02 +05:30
noahjacob
110f28f869 Company field editable and is readonly after saving. 2021-04-09 20:01:47 +05:30
Saqib
14b98c1737
Merge branch 'develop' into issue-condition-fix 2021-04-09 18:29:01 +05:30
Anupam Kumar
986452107b
fix: Lead Source's module (#24583) 
* fix: Lead Source's module

* fix: patch fix
 2021-04-09 18:15:51 +05:30
Anupam Kumar
a91d7bd4b5
Merge branch 'develop' into se-add-to-transit 2021-04-09 18:00:03 +05:30
Anupam Kumar
cd2aedd0c6
Merge branch 'develop' into planning 2021-04-09 17:59:47 +05:30
Ankush Menat
5451bbf7d2
fix: condition for SLA status banner 
If the document is NOT in the closed state and fulfilled then there
won't be any banner. This bug was introduced while fixing a bug related
to buttons, so separated out code for showing buttons and showing
banners.
 2021-04-09 17:19:02 +05:30
rohitwaghchaure
526f76c27d
Merge pull request #25257 from rohitwaghchaure/travis-fix-for-project 
fix: travis
 2021-04-09 17:07:22 +05:30
Rohit Waghchaure
ca5e10892c fix: travis 2021-04-09 16:23:45 +05:30
Afshan
dc73a9995d
Merge branch 'develop' into add-blank-for-status-issue-reports 2021-04-09 13:04:34 +05:30
Marica
c6b3766fb2
Merge pull request #24921 from Anurag810/item-dashboard-fixes 
fix: precision and formatted document for stock level in item dashboard.
 2021-04-09 12:43:06 +05:30
Saqib Ansari
032246dc2b feat(italy): add document type field for e-invoicing 2021-04-09 12:08:24 +05:30
Marica
d38618fc34
Merge branch 'develop' into item-dashboard-fixes 2021-04-09 11:57:56 +05:30
Marica
5467d7c3e3
fix: Use system precision instead of SLE precision 2021-04-09 11:56:49 +05:30
Marica
a7ac01153e
fix: Remove redundant import and import cint 2021-04-09 11:55:44 +05:30
Marica
ad75944960
Merge pull request #25105 from Anuja-pawar/fix_picked_qty_in_DN 
fix: Picked Qty conversion from Stock Qty to Qty while creating DN from Pick List
 2021-04-09 11:48:56 +05:30
Saqib Ansari
e7813b69c4 fix: condition for setting agreement status 2021-04-09 11:46:16 +05:30
Marica
b89a40aa3c
Merge branch 'develop' into fix_picked_qty_in_DN 2021-04-09 11:45:39 +05:30
Marica
7f0e92c9b9
Merge pull request #25232 from nextchamp-saqib/coa-importer-validate-fix 
fix: keyerror while validating coa file
 2021-04-09 11:44:40 +05:30
Deepesh Garg
63e6036d12
Merge pull request #25235 from ankush/remove_purch_inv_validation 
fix: remove gst name validation for purchase Invoice
 2021-04-09 10:48:34 +05:30
Saqib
4191e7999d
chore: add error title 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-04-08 21:04:56 +05:30
Deepesh Garg
edb4663258
Merge pull request #25251 from nextchamp-saqib/einv-ack-no-fix 
fix(india): set correct ack no. on irn generation
 2021-04-08 20:48:01 +05:30
Saqib Ansari
30720d2139 fix: set correct ack no. on irn generation 2021-04-08 19:06:44 +05:30
Rucha Mahabal
b7aa658a51
refactor(HR): Add missing reports and doctypes to the Workspace (#24994) 
* refactor(HR): Add missing reports and doctypes to the Workspace

* refactor: remove Employee Tax and Benefits from HR Workspace

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2021-04-08 18:13:21 +05:30
Jannat Patel
d9fa79de99
fix: serial no refresh issue (#25127) 
* fix: serial no refresh issue

* fix: sider
 2021-04-08 16:04:57 +05:30
Anupam Kumar
9d830255c1
Merge branch 'develop' into se-add-to-transit 2021-04-08 14:44:08 +05:30
rohitwaghchaure
f9fde054e1
Merge pull request #25242 from rohitwaghchaure/fixed-test-case-for-bom-cost 
fix: bom cost test case
 2021-04-08 14:39:08 +05:30
Marica
6a98d39201
Merge branch 'develop' into fixed-incorrect-batch-selected-in-purchase-rceipt-develop 2021-04-08 13:57:35 +05:30
HENRY Florian
e286750a0f
fix: UOM length unit in global setup list is empty (#24855) 
* When ERPNext is installed in localized language the category of UOM Conversion Factor is tranlasted into installed languaes. Filter must be locallized

* fix

* fix

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-04-08 13:56:29 +05:30
Marica
fb9fc944c5
Merge branch 'develop' into coa-importer-validate-fix 2021-04-08 13:46:42 +05:30
Rohit Waghchaure
fa8bb87a86 fix: bom cost test case 2021-04-08 13:38:22 +05:30
rohitwaghchaure
5d3f665cc5
Merge pull request #25240 from ankush/job_card_rounding 
fix: round total quantity in job card
 2021-04-08 13:10:09 +05:30
Ankush Menat
cb625d868c
fix: round total quantity in job card 2021-04-08 12:05:52 +05:30
Saqib
f10d107a0a
Merge branch 'develop' into coa-importer-validate-fix 2021-04-08 11:25:29 +05:30
Anupam Kumar
dfdf72cbb2
Merge branch 'develop' into planning 2021-04-08 10:58:05 +05:30
Anupam Kumar
8edf9d23c0
Merge branch 'develop' into se-add-to-transit 2021-04-08 10:57:50 +05:30
Ankush Menat
76c8521010
fix: remove gst name validation for purch Invoice 2021-04-07 16:28:13 +05:30
Afshan
e2da3cbc28
fix: payroll issues (#24540) 
* fix: payroll issues

* fix: enhancements

* fix: rename variables and refactor

* fix: slider

* fix: added missing arguments

* fix: test cases

* fix: slider

* fix: slider

fix: slider

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-04-07 15:13:44 +05:30
Saqib Ansari
5541aeaa82 fix: keyerror while validating coa file 2021-04-07 12:34:20 +05:30
Walstan Baptista
c39720db50
fix: frappe.whitelist for doc methods (#25231) 2021-04-07 11:51:22 +05:30
Walstan Baptista
90e240c3e6
fix: frappe.whitelist for doc methods (#25230) 2021-04-07 11:32:51 +05:30
Saurabh
e0222723f0 Merge branch 'version-13-pre-release' into version-13 2021-04-07 11:13:40 +05:30
Saurabh
547fd31a37 bumped to version 13.0.1 2021-04-07 11:33:40 +05:50
Nabin Hait
aa809ceffe
fix: Patch fixes for v13 upgrade (#25220) 2021-04-07 10:57:46 +05:30
Deepesh Garg
3d5a4ffd66
Merge pull request #24879 from deepeshgarg007/loan_fixes_phase_2 
fix: Loan Repayment entry cancellation on salary slip cancel
 2021-04-07 10:33:46 +05:30