Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,262 Commits 3 Branches 0 Tags 1 GiB
23ef51a981
Commit Graph

1360 Commits

Author SHA1 Message Date
Rohit Waghchaure
eb1e3181a4 fix: conflicts while merging brnach version-13 to develop 2021-08-17 10:53:19 +05:30
Deepesh Garg
4b9c127494 Merge branch 'version-13-pre-release' of https://github.com/frappe/erpnext into export_type_mandatory_v13_pre 2021-08-16 14:38:54 +05:30
Deepesh Garg
b58b1127f3 fix: Add mandatory depends on condition for export type field 2021-08-16 14:36:50 +05:30
Deepesh Garg
3f07bb7021 fix: Add mandatory depends on condition for export type field 2021-08-16 13:18:39 +05:30
Rohit Waghchaure
7167fd00bc Merge branch 'version-13-hotfix' into merged-v13-hotfix-into-pre-release 2021-08-10 23:30:16 +05:30
Frappe PR Bot
a7e0805039
fix(e-invoicing): cannot cancel invoice if IRN cancelled on portal (#26879) 2021-08-10 17:16:15 +05:30
Saqib
84c4161c00
fix(e-invoicing): cannot cancel invoice if IRN cancelled on portal (#26638) 2021-08-10 16:46:44 +05:30
Rohit Waghchaure
f571e42aa4 Merge branch 'version-13-hotfix' into merge-version-13-hotfix-into-v13-pre-9 2021-08-10 01:06:23 +05:30
Frappe PR Bot
18bd182f61
patch: delete all orphaned tables docs (#26863) 2021-08-09 18:34:51 +05:30
Anuja Pawar
08ae49cd11
fix(regional): add permissions for VAT Audit report (#26851) 
fix(regional): add permissions for VAT Audit report
 2021-08-09 17:58:52 +05:30
Ganga Manoj
458f7f1194
patch: delete all orphaned tables docs (#26743) 2021-08-09 17:16:48 +05:30
Frappe PR Bot
1b9a5c851d
fix: incorrect amount in work order required items table. (#26585) (#26623) 
* fix: amount in work order not equal to rate * qty

* fix: patch for amount in work order required items

(cherry picked from commit cd12d95a24)

Co-authored-by: Ankush <ankush@iwebnotes.com>
 2021-08-03 20:06:36 +05:30
Deepesh Garg
346bde875c Merge branch 'develop' of https://github.com/frappe/erpnext into sa-vat-report 2021-08-03 14:44:20 +05:30
Ankush
efb037b566
refactor!: drop shopify integration from ERPNext (#26700) 
BREAKING CHANGE: remove Shopify integration.

The integration is moved to a separate app with additional enhancements.

The app is still FOSS and licensed under the same license as ERPNext. Any
data migration required is taken care of after installing the app and
enabling it.

New app: https://github.com/frappe/ecommerce_integrations
 2021-08-02 21:57:52 +05:30
Ankush
e43bdf76a5
chore: warning for shopify integration deprecation (#26701) 
* chore: warning for shopify integration deprecation

* fix: warn deprecation during patch for sysadmins
 2021-08-02 18:57:48 +05:30
Anuja
3bcbc86291 fix: resolved conflicts in patches.txt 2021-08-02 12:58:46 +05:30
Anuja
f9fc3bbfa8 fix: added patch for custom field and minor fixes 2021-08-02 12:54:30 +05:30
Rohit Waghchaure
343143037c fix: conflicts 2021-08-01 14:45:24 +05:30
Anupam Kumar
89f2138fbc
Merge branch 'version-13-hotfix' into email-digest 2021-07-28 18:24:29 +05:30
Deepesh Garg
8c7d9efa9d fix: Chnage fieldtype from data to check 2021-07-28 17:18:50 +05:30
Deepesh Garg
9350249941 fix: Chnage fieldtype from data to check 2021-07-28 12:57:59 +05:30
Deepesh Garg
a661667e2a fix(India): Default value for export type 2021-07-26 18:46:14 +05:30
Ankush
cd12d95a24
fix: incorrect amount in work order required items table. (#26585) 
* fix: amount in work order not equal to rate * qty

* fix: patch for amount in work order required items
 2021-07-25 13:10:50 +05:30
Deepesh Garg
328444b530 fix(India): Default value for export type 2021-07-23 20:28:02 +05:30
Rucha Mahabal
57514f7b1d
feat(Non Profit): API Endpoint to update halted Razorpay subscriptions (#26427) (#26564) 
* feat: Update Subscription Activated field to Subscription Status to accomodate Halted status

* feat: API Endpoint to halt Razorpay subscription

* fix: sider

* fix: validation message

* test: halted razorpay subscription
 2021-07-21 00:46:34 +05:30
Rucha Mahabal
a758071532
feat(Non Profit): API Endpoint to update halted Razorpay subscriptions (#26427) 
* feat: Update Subscription Activated field to Subscription Status to accomodate Halted status

* feat: API Endpoint to halt Razorpay subscription

* fix: sider

* fix: validation message

* test: halted razorpay subscription
 2021-07-21 00:24:09 +05:30
Rohit Waghchaure
56e4a88956 fix: added patch to fix missing FG item 2021-07-16 15:06:57 +05:30
Rohit Waghchaure
13e9aa5956 fix: added patch to fix missing FG item 2021-07-16 14:34:24 +05:30
Rohit Waghchaure
a748dd9261
feat: provision to make subcontracted purchase order from the production plan 2021-07-15 19:01:36 +05:30
Saqib
0683337f14
fix: incorrect response by variance & resolution by variance (#26173) 2021-07-12 20:21:07 +05:30
Nabin Hait
fa006402b8 fix: merge conflict 2021-07-01 12:47:28 +05:30
Rohit Waghchaure
61690775a8 feat: provision to make subcontracted purchase order from the production plan 2021-06-29 19:59:20 +05:30
Rohit Waghchaure
c878389050 fix: or condition filter in the get_all 2021-06-24 18:14:18 +05:30
Afshan
7fd44907ba
feat: fetching of qty as per received qty from PR to PI (#26184) 2021-06-24 14:26:36 +05:30
Afshan
53fefd7513
feat: fetching of qty as per received qty from PR to PI (#25837) 2021-06-24 10:09:02 +05:30
Nabin Hait
0950481253 fix: merge conflict 2021-06-15 20:18:06 +05:30
Saqib
80077d215f
fix: patch for adding doctype to sla (#26053) 2021-06-14 19:34:25 +05:30
Himanshu
ec25d5938b
feat(SLA): Apply SLA to any document (#22449) 2021-06-14 19:05:52 +05:30
Gavin D'souza
3dfbfe87e9 chore: Drop < v10 patches from list 
v7 backup was restored and upgraded to latest v10.x.x branch. The patches run uptil the upgrade are removed in this change. This means only existing v10 sites are allowed direct upgrade to v13 and newer

There are older version patches still left since they're being used in later ERPNext versions too.
 2021-06-10 15:07:56 +05:30
Gavin D'souza
8697e89441 chore: Drop < v10 patches from list 
v7 backup was restored and upgraded to latest v10.x.x branch. The patches run uptil the upgrade are removed in this change. This means only existing v10 sites are allowed direct upgrade to v13 and newer

There are older version patches still left since they're being used in later ERPNext versions too.
 2021-06-04 11:49:56 +05:30
Deepesh Garg
0ea6725baa
fix: Rename Loan Management workspace to Loans (#25856) 2021-05-31 19:48:31 +05:30
Anuja P
5e4128e70c fix: patch for existing issues 2021-05-26 20:03:14 +05:30
Anurag Mishra
5670cf4386
feat: enhancements in Training Event (#25782) 
* feat: Some Minor fixes

* fix: patch file

* fix: patch

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-05-24 20:24:20 +05:30
Anupam
aeb88385bb patch: timesheet changes 2021-05-20 14:11:36 +05:30
Anupam
35137ba9e0 removing currency filter and added rate conversion while fetching timesheets in SI 2021-05-16 14:17:56 +05:30
Anupam
fd4743cc31 refactor: timesheet 2021-05-15 20:01:17 +05:30
Deepesh Garg
55fe85d850
feat(India): Multiple GST enhancement and fixes (#25249) 
* fix: RCM tax calculation

* feat(India): ITC Reversal via Journal Entry

* fix: Reverse Charge booking logic and validation

* fix: Addd patch for availed ITC fields

* fix: Hooks method to update availed ITC field

* fix: Cleanup and fixes in GSTR3B report

* fix: Update params in GSTR-1 report

* fix: Debit note using Sales Invoice

* fix: Setup and patch

* fix: GSTR 3B report cleanup and updates

* fix: Add method to get invoices liable to reverse charge

* fix: Add taxable value in Purchase Invoice Item

* fix: Inward supplies liable to reverse charge

* fix: Linting issues

* fix: GSTR3B report test
 2021-05-14 12:17:41 +05:30
Saqib
900a8fb21a
feat(pos): ability to retry on pos closing failure (#25595) 
* feat(pos): ability to retry on pos closing failure

* fix: sider issues

* fix: sider issues

* fix: mark all queued closing entry as failed

* feat: add headline message
 2021-05-06 17:02:47 +05:30
Saqib
d502f76319
feat(e-invoicing): e-way bill validity field (#25555) 2021-05-06 16:10:55 +05:30
Raffael Meyer
b2be91e731
Merge branch 'develop' into datev_fixes 2021-04-27 12:21:14 +02:00