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

36325 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Suraj Shetty
dfb8aa017d ci: Check limits 2021-05-09 14:38:54 +05:30
Suraj Shetty
2ac27d774d test: Fix test dependency 2021-05-09 14:38:28 +05:30
Suraj Shetty
7044bcfaab ci: Try parallel testing with orchestrator 2021-05-09 11:29:00 +05:30
Suraj Shetty
142ec9e99e test: Pass ConflictingTaxRule during tax rule test 2021-05-08 19:03:53 +05:30
Ganga Manoj
aa9e172091
feat: Add Create Expense Claim button in Delivery Trip (#25526) 
* feat(Delivery Trip): Add employee_code field

* feat(Expense Claim): Add Delivery Trip Number field

* feat(Delivery Trip): Add Create Expense Claim button

* feat(Delivery Trip): Make Create Expense Claim button show up after save

* fix(Delivery Trip): Fix Sider issues

* fix(Delivery Trip): Display button after submit

* fix(Delivery Trip & Expense Claim): Rename new fields

* fix(Delivery Trip): Add button in refresh

* fix(Delivery Trip): Remove redundant line

* fix(Expense Claim): Display delivery_trip only if non-empty

* fix(Delivery Trip): Add test for Create Expense Claim

* fix(Delivery Trip): Fix Sider Issue

* fix(Delivery Trip): Only display Create Expense Claim if the driver is an employee

* fix(Delivery Trip): Fix test

* fix(Delivery Trip): Fix make_expense_claim()

* fix: sider

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-05-08 17:15:33 +05:30
Suraj Shetty
d27e70a67a ci: Fix coveralls 2021-05-08 16:02:40 +05:30
Suraj Shetty
622bf077e7 ci: Disble failfast temporarily 2021-05-08 13:51:34 +05:30
Suraj Shetty
80aa8a3149 Merge branch 'develop' of github.com:frappe/erpnext into parallel-distributed-testing 2021-05-08 11:28:27 +05:30
Suraj Shetty
ccf6249bfb chore: Debug 2021-05-08 00:05:48 +05:30
Suraj Shetty
490aed2a16 chore: Debug 2021-05-08 00:04:34 +05:30
rohitwaghchaure
64bd4f27b8
Merge pull request #25611 from rohitwaghchaure/validation-to-check-duplicate-serial-nos 
fix: added validation in stock entry to check duplicate serial nos
 2021-05-07 23:30:27 +05:30
rohitwaghchaure
42fe07bd19
Merge pull request #25551 from rohitwaghchaure/fixed-total-stock-summary-report 
fix: total stock summary report not working
 2021-05-07 23:30:06 +05:30
rohitwaghchaure
1726ce547c
Merge pull request #25471 from rohitwaghchaure/allow-to-receipt-same-serial-no 
fix: allow to receive same serial numbers multiple times
 2021-05-07 23:27:50 +05:30
Alan
c6dc9eaf2e
feat!: add pick batch button (#25413) 
* feat!: add pick batch button

BREAKING CHANGE: replaces setup_serial_no with setup_serial_or_batch_no.

* refactor: use setup_serial_or_batch_no instead of setup_serial_no

* refactor: use setup_serial_or_batch_no instead of setup_serial_no

* refactor: use setup_serial_or_batch_no instead of setup_serial_no

* style: add sider review changes

* refactor: make consice, extract function

* refactor: camel to snake casing
 2021-05-07 20:30:04 +05:30
Ankush Menat
90e671905a
chore: replace assertEquals with alias assertEqual (#25613) 
* chore: replace assertEquals with alias assertEqual

assertEquals has been deprecated.

ref: https://docs.python.org/3/library/unittest.html#deprecated-aliases

* chore: sider fixes
 2021-05-07 20:28:51 +05:30
Ankush Menat
e28165ea87
fix: force https for shopify webhook registration (#25630) 2021-05-07 20:27:51 +05:30
Anupam Kumar
da7fefe29d
fix: timesheet filter date exclusive issue (#25626) 2021-05-07 20:26:50 +05:30
Faris Ansari
f97cc0367b fix: initialize filters in constructor 2021-05-07 15:32:06 +05:30
Faris Ansari
69eb6d476e Merge remote-tracking branch 'upstream/develop' into esbuild 2021-05-07 15:21:33 +05:30
Faris Ansari
a0ac5e3b13 chore: Add git blame ignore revs file 
Ignore the commit which replaces use of Class.extend with native class in git blames
 2021-05-07 14:57:32 +05:30
Faris Ansari
0c8294c963 fix: gitignore dist directory 2021-05-07 14:53:55 +05:30
Faris Ansari
464d838447 fix: Update bundle paths 2021-05-07 14:53:42 +05:30
Faris Ansari
ff3b71d2e7 fix: Make css bundles 2021-05-07 14:52:13 +05:30
Faris Ansari
f751738267 fix: Make js bundles 2021-05-07 14:51:05 +05:30
Saqib
27cf19a19f
feat(pos): show POS reserved stock in stock projected qty report (#25593) 
* feat(pos): consider POS reserved stock in stock projected qty report

* chore: remove unwanted string formats
 2021-05-07 13:37:42 +05:30
Ganga Manoj
5618ce3852
fix(Material Request): Add 'Partially Received' to Status drop-down list (#24857) 
Co-authored-by: Ganga Manoj <ganga_manoj@Gangas-MacBook-Air.local>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-05-07 13:35:09 +05:30
Syed Mujeer Hashmi
bcf3f3dd29
fix: Monthly Attendance Sheet Summarized view (#24976) 
* fix: Monthly Attendance Sheet Summarized view

This fixes the count of different leave types in the monthly
attendance sheet summarized view.

Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>

* fix: Avoid using raw sql query

Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2021-05-07 13:34:21 +05:30
HENRY Florian
3ecd7ac4c7
fix: Add french chart accounts with account number (#25009) 
* fix: Add french chart accounts with account number

* fix actual franch plan
 2021-05-07 13:33:12 +05:30
Rucha Mahabal
062d30146f
fix: Include search fields in Project Link field query (#25505) 
* fix: Include search fields in Project Link field query

* fix: add project_name to Project search fields
 2021-05-07 13:31:14 +05:30
Umair Sayed
7f79d463f6
fix: Stock and Accounts Settings form refactor (#25534) 
* stock and accounts settings page

* fix: Stock and accounts settings page cleanup

Co-authored-by: Umair Sayed <umairsayed@Umairs-MacBook-Air.local>
 2021-05-07 12:28:57 +05:30
Shariq Ansari
735fbdc350
fix: Updating Standard Notification's channel field (#25564) 2021-05-07 12:26:32 +05:30
Shariq Ansari
ad3edc83ec
fix: Render timesheet template on timer field (#25565) 
* fix: Render timesheet template on timer field

* fix: sider fix
 2021-05-07 12:25:40 +05:30
Deepesh Garg
00e00e4e90
fix: Report summary showing inflated values when values are accumulated in Group Company (#25577) 
* fix: Report summary showing inflated values when values are accumullated in Group Company

* fix: Remove extra space

* fix: Translate strings

* fix: Remove unintended changes
 2021-05-07 12:16:44 +05:30
Shadrak Gurupnor
f648d2d7c4
fix: added tax_types list (#25587) 2021-05-07 12:15:19 +05:30
Ankush Menat
996f7e53a1
fix: update shopify api version (#25600) 2021-05-07 12:14:14 +05:30
Anuja Pawar
f132ed4335
fix: update item level cost center from POS (#25609) 2021-05-07 12:11:09 +05:30
Alan
0e0de6baa1
fix: prevent spurious defaults for items when making prec from dnote (#25559) 
* fix: prevent spurious defaults for items when making prec from dnote

* refactor: make concise, use dict comp
 2021-05-07 11:40:02 +05:30
Nikhil Ponnuru
ef9f126cb2
fix: change get_all to get_list in employee leave balance summary report to hide descendants when hide descendants is selected in user permissions (#25599) 
Co-authored-by: nikhilponnuru <nikhil.kp@zerodha.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-05-07 10:06:29 +05:30
Suraj Shetty
5117cbc08c ci: Enable coveralls 2021-05-07 00:32:00 +05:30
Noah Jacob
4ecae62194
fix: added is_stock_item filter (#25530) 2021-05-06 19:42:01 +05:30
Nabin Hait
7481f54e0c Merge branch 'version-13' into develop 2021-05-06 19:18:18 +05:30
Nabin Hait
ec2ba6bc1f Merge branch 'version-13-pre-release' into version-13 2021-05-06 19:18:17 +05:30
Nabin Hait
ae18efaa0a bumped to version 13.2.1 2021-05-06 19:38:17 +05:50
Nabin Hait
0e41295c0e
perf: Performance enhancement on setup wizard (#25606) 
* perf: Performance enhancement on setup wizard

* fix: create departments without updating nsm
 2021-05-06 19:14:06 +05:30
Nabin Hait
134eaa5786
perf: Performance enhancement on setup wizard (#25605) 
* perf: Performance enhancement on setup wizard

* fix: create departments without updating nsm
 2021-05-06 19:13:54 +05:30
Suraj Shetty
c702408f99 chore: Remove unnecessary print statements 2021-05-06 18:37:45 +05:30
Suraj Shetty
bdf8c528f1 test: Fix dependencies 2021-05-06 18:37:14 +05:30
Rohit Waghchaure
695becdd05 fix: added validation in stock entry to check duplicate serial nos 2021-05-06 18:03:32 +05:30
Anurag Mishra
80c5c866db
Revert "fix: default value for Templates (#25591)" (#25608) 
This reverts commit 60f3e9ee29.
 2021-05-06 17:45:58 +05:30
rohitwaghchaure
dc6233b703
Merge pull request #25541 from rohitwaghchaure/fixed-incorrect-serial-no-set 
fix: serial no changed after saving stock reconciliation
 2021-05-06 17:44:36 +05:30