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

33313 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
marination
e9b04dc727 fix: Payment Reconciliation client side validations 2020-10-16 12:36:13 +05:30
Saqib
2f71927af8
fix: fuel expense amount of vehicle log (#23632) 
* fix: fuel expense amount of vehicle log

* fix: undefined var employee_id in test

* fix: test
 2020-10-16 12:32:59 +05:30
Mangesh-Khairnar
c66fce4965 fix: reload current pos doc after updating the information via callback 2020-10-16 12:03:08 +05:30
Mangesh-Khairnar
cab5d22ef5 fix: add a realtime publish to refresh the dashboard content 2020-10-16 11:38:07 +05:30
prssanna
5ee7bca185 Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui 2020-10-16 11:32:10 +05:30
prssanna
12d4be7f3f feat: icons in leaderboard 2020-10-16 11:31:47 +05:30
Saqib Ansari
de505631a6 fix: codacy 2020-10-16 11:30:34 +05:30
Saqib Ansari
1dec68e8e4 fix: transalation syntax 2020-10-16 10:47:29 +05:30
Deepesh Garg
775e689ba9 fix: Add tests 2020-10-15 22:09:05 +05:30
Deepesh Garg
01a7297f69 Merge branch 'develop' of https://github.com/frappe/erpnext into stock_entry_conversion_factor 2020-10-15 17:13:29 +05:30
rohitwaghchaure
e8a3825ed1
Merge pull request #23649 from rohitwaghchaure/set-current-serial-no-in-serial-no-field-develop 
fix: serial no field is blank in stock reconciliation
 2020-10-15 16:56:39 +05:30
Rohit Waghchaure
5f465394a7 fix: serial no field is blank in stock reconciliation 2020-10-15 15:56:50 +05:30
rohitwaghchaure
79c1c4e3fb
Merge pull request #23398 from anupamvs/quality-procedure-v13 
fix: quality procedure parent
 2020-10-15 15:52:22 +05:30
Shivam Mishra
cb8457b9ae feat: add description to Accounts onboarding 2020-10-15 13:53:12 +05:30
Abhishek Balam
349fcfd6a5 fix: set default filters on unchecking box, code cleanup 2020-10-15 12:21:43 +05:30
Wolfram Schmidt
3959ed5bef
Update payment_term.json (#23644) 
added descriptions to fields to clarify input.
 2020-10-14 22:48:46 +05:30
Deepesh Garg
ddccec4f5d
Merge pull request #23643 from deepeshgarg007/payment_reco_cancel 
fix: Do not get cancelled vouchers in Payment Reconciliation
 2020-10-14 22:09:08 +05:30
Deepesh Garg
37c2ed269e fix: Do not get cancelled vouchers in Payment Reconciliation 2020-10-14 21:47:43 +05:30
Abhishek Balam
89419c9a30 fix: move get_shipping_address() from frappe to erpnext and fix references 2020-10-14 20:09:05 +05:30
Abhishek Balam
2f528c1c73 fix: gettext import and changed function order in address.py 2020-10-14 19:48:57 +05:30
Abhishek Balam
c0215d257c
Merge branch 'develop' into address_customisation 2020-10-14 19:33:16 +05:30
Abhishek Balam
6e9e7b4c7a fix: serverside validation overrides 2020-10-14 19:31:37 +05:30
Abhishek Balam
38b26c8f3e fix: added semicolons 2020-10-14 18:24:51 +05:30
rohitwaghchaure
f8ce64c0ca
Merge pull request #23443 from marination/rfq-email 
feat: Supplier Email Preview in RFQ
 2020-10-14 18:16:59 +05:30
Abhishek Balam
346ca568b7 fix: set company link in address when is_your_company_address is set 2020-10-14 18:11:04 +05:30
Nabin Hait
a2d6f254c5
Merge branch 'develop' into add-acc-to-a-group-fix 2020-10-14 16:34:56 +05:30
Afshan
9e08b21e0b
fix: removing unused imports (#23633) 2020-10-14 15:44:52 +05:30
Saqib
577a7fe01d
fix: stock & account balance difference in fraction (#23635) 2020-10-14 15:44:30 +05:30
Raffael Meyer
d1863e6f9e
fix: Chart of Accounts (#23530) 
* fix: Chart of Accounts

* fix: Chart of Accounts with lower case "of"

Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-14 10:29:53 +05:30
Anupam Kumar
31417864cb
fix: project value is missing from procurement-tracker (#23549) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-10-14 10:29:25 +05:30
Frappe PR Bot
d8ddc321f8
chore: Update translations (#23577) 
Co-authored-by: frappe <frappe@scw-dazzling-elgamal>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-10-14 10:28:21 +05:30
Suraj Shetty
0a6770a4ef
chore: GitHub actions for translation syntax validation and docs link (#23627) 
* chore: Add GA for translation syntax validation

* chore: Documentation link checker

Co-authored-by: Gavin D'souza <gavin18d@gmail.com>

* fix: URL

Co-authored-by: Nabin Hait <nabinhait@gmail.com>

Co-authored-by: Gavin D'souza <gavin18d@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-14 10:21:31 +05:30
Rucha Mahabal
317fd06483
Merge pull request #23333 from ruchamahabal/enrollment-fixes 
fix: Program and Course Enrollment fixes
 2020-10-14 00:08:25 +05:30
rohitwaghchaure
cb791330f6
Merge branch 'develop' into quality-procedure-v13 2020-10-13 23:39:45 +05:30
Rucha Mahabal
f625da2b8b
Merge branch 'develop' into enrollment-fixes 2020-10-13 23:24:42 +05:30
rohitwaghchaure
4d93bfebd8
Merge pull request #23622 from AfshanKhan/fix-billing-summary-report-precision 
fix: setting user defined precision instead of 2
 2020-10-13 22:46:02 +05:30
Rucha Mahabal
ff0917358c fix: test 2020-10-13 22:39:05 +05:30
Saqib
639eea142f
Merge branch 'develop' into add-acc-to-a-group-fix 2020-10-13 21:42:22 +05:30
Deepesh Garg
8a7886ac60
Merge pull request #23621 from frappe/address_template_luxembourg 
feat: add address template for luxembourg
 2020-10-13 21:31:51 +05:30
Deepesh Garg
71a58a8fd0
Merge pull request #23605 from marination/item-link-formatter 
fix: Item Link Formatter Behaviour
 2020-10-13 21:26:00 +05:30
Sun Howwrongbum
93da52941e
fix: consider rounded_total in returns (#23609) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-10-13 21:23:26 +05:30
Deepesh Garg
06268e5f57
Merge pull request #23623 from kennethsequeira/italy-fy 
fix: Fiscal Year and Tax Rates for Italy
 2020-10-13 20:29:51 +05:30
Shivam Mishra
55f52e8135 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-10-13 20:09:22 +05:30
rohitwaghchaure
db0fefd92c
Merge pull request #23614 from aakvatech/patch-3 
feat: Add company and correct filter in bank reconciliation statement
 2020-10-13 19:59:31 +05:30
rohitwaghchaure
2a8a2215d0
Merge pull request #23620 from anupamvs/lead-address 
fix: displaying mandatory address field in Lead form
 2020-10-13 19:54:44 +05:30
Kenneth Sequeira
3eec4e61ab fix: GST rates for Australia 2020-10-13 19:23:48 +05:30
Kenneth Sequeira
1b329aaa7b fix: json format fixes 2020-10-13 19:10:09 +05:30
Afshan
c359d3528f fix: setting user precision instead of default 2020-10-13 18:54:54 +05:30
Deepesh Garg
54c898708b Merge branch 'develop' of https://github.com/frappe/erpnext into loan_repayment_type_remove 2020-10-13 18:11:45 +05:30
Deepesh Garg
66967c6d45 fix: Loan Security unpledge on loan cancel 2020-10-13 18:10:51 +05:30