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

23886 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Faris Ansari
b1d6f94cdf Merge branch 'hub-redesign' into hub-redesign-contact-seller 2018-07-31 14:54:58 +05:30
Fisher Yu
13aec3aecb Simplified Chinese Translation Update (#14992) 
* delete the old version to be replaced by a new one

* New version of the translated simplified Chinese
 2018-07-31 13:29:35 +05:30
Nabin Hait
eed3d4c1b3 Fixed Merge Conflict 2018-07-31 12:36:16 +05:30
Nabin Hait
ebdefade9b Merge branch 'hotfix' 2018-07-31 12:18:23 +05:30
Nabin Hait
e9afbfde76 bumped to version 10.1.45 2018-07-31 12:48:22 +06:00
Faris Ansari
2ae80fd000 wip 2018-07-31 12:02:20 +05:30
Prateeksha Singh
425356c21c [hub] remove test code 2018-07-31 10:45:53 +05:30
Nabin Hait
d53c2c031d more payroll improvements and tests fixes 2018-07-30 20:17:15 +05:30
rohitwaghchaure
1fa5698798 [minor] Freeze the screen to avoid multiple time clicks (#15047) 2018-07-30 19:11:43 +05:30
rohitwaghchaure
086da451ca Removed academic term from validation to check duplicate program enrollement (#15046) 2018-07-30 19:11:14 +05:30
Nabin Hait
d305a7a959 Made leave application importable 2018-07-30 17:12:32 +05:30
Nabin Hait
4f135c9805 Payroll entry ux improvements and processing via background jobs 2018-07-30 16:37:07 +05:30
Nabin Hait
04d5412754 Fixed conflict 2018-07-30 16:37:07 +05:30
Prateeksha Singh
46df72d55d [hub] test progress trigger 2018-07-30 13:24:01 +05:30
Shreya Shah
b2e0f649d2
Merge pull request #15043 from shreyashah115/fix-typo 
Fix typo in label
 2018-07-30 12:27:19 +05:30
Shreya
21ce5e0609 Fix typo in label 2018-07-30 12:07:46 +05:30
Nabin Hait
9c735e43b0
Grant leaves via modal and backgroud jobs (#15026) 2018-07-30 10:58:49 +05:30
Zarrar
89c87fd6a6 [Minor] Patch fix (#15041) 
* update modified date

* remove extra parameter from function call
 2018-07-30 10:57:47 +05:30
Zarrar
6004b66797 [Minor] Job Offer UX improvise (#15042) 
* job offer ux improv

* Update job_offer.js
 2018-07-30 10:57:13 +05:30
Nabin Hait
cce7c5c245 Fixed salary structure employee patches 2018-07-30 10:52:51 +05:30
rohitwaghchaure
91d2ace9bb Account no + account name in trial balance and financial statements reports (#15038) 2018-07-30 10:38:51 +05:30
Prateeksha Singh
efbd2ee3f5 [hub] Realtime Sync Progress 
- Show progress from the migration plan
- Show products being synced
- Disallow publishing in sync state
 2018-07-30 09:17:14 +05:30
Prateeksha Singh
811cc3f78f [hub] resolve merge conflicts 2018-07-29 18:05:07 +05:30
Prateeksha Singh
d27b27f88a Hub Seller Profile and Timeline 
- profile details fetched from server
- timeline updates on publishing items
 2018-07-29 16:52:16 +05:30
Prateeksha Singh
6f05ea124e [hub] Track Hub Sync on the Server 
- Create a Hub Seller activity on start of Hub Sync
- Store its name as remote_id in the Run
- Update that activity remotely once the Run here is complete, status
 2018-07-29 14:40:52 +05:30
Faris Ansari
296848cb69 Publish Page 
- Code cleanup
- Separate local item card and hub item card
- Use make_search_bar
 2018-07-28 16:14:22 +05:30
Faris Ansari
abcc8ab8e5 Push review area to bottom 2018-07-28 13:57:16 +05:30
Prateeksha Singh
d0a1a4fe90 [hub] differentiate self-published items 2018-07-28 13:16:09 +05:30
Prateeksha Singh
f6f429fb10 [hub] Item page skeleton 2018-07-28 12:25:14 +05:30
Shreya Shah
91a9ee5179 Merge accounts functionality (#14993) 
* Add dialog to merge accounts

* Add conditions and merge functionality

* Fix travis

* Add test case

* Add more test scenarios
 2018-07-28 10:26:11 +05:30
Prateeksha Singh
dd8045759f [hub] Published Products Page 2018-07-28 01:54:51 +05:30
Prateeksha Singh
83d60ffa1d [hub] update hub item mapping 2018-07-28 00:07:25 +05:30
Prateeksha Singh
6e7fb71f1f [hub][patch] reset publish_in_hub for all items 2018-07-27 22:02:47 +05:30
Faris Ansari
19d40cafba Merge branch 'hub-redesign' of https://github.com/netchampfaris/erpnext into hub-redesign 2018-07-27 21:51:31 +05:30
Faris Ansari
b7a63ab81e Homepage 
- show random items from each hub seller
- show items from country
- move add_review method on hub
 2018-07-27 21:51:26 +05:30
Prateeksha Singh
f4fbf5215b [hub][search] empty search and route fallback 2018-07-27 21:07:56 +05:30
Faris Ansari
44f7d2e62b SearchPage 2018-07-27 15:33:00 +05:30
Shreya Shah
749094dd52 Translatable UOMs (#15024) 2018-07-27 12:54:34 +05:30
Nabin Hait
fa06ee80e9 Fixed merge conflict 2018-07-27 12:54:00 +05:30
Nabin Hait
11137850cb Merge branch 'hotfix' 2018-07-27 12:35:42 +05:30
Nabin Hait
584153a1b1 bumped to version 10.1.44 2018-07-27 13:05:42 +06:00
Shreya Shah
eed0a4e2df Do not copy remarks field while duplicating (#15023) 2018-07-27 11:26:35 +05:30
FinByz Tech Pvt. Ltd
f5cc1bd44c Created Eway Bill Report (#14926) 
* Created Eway Bill Report

* Field value changes

* Changed module from Stock to Regional

* Added comments and minor fix

* minor fix
 2018-07-27 11:21:42 +05:30
Yaqin Shurrab
cc56ff5c37 Get the correct Summation of Closing Balances (#14990) 
Fix total raw values for Closing Credit and Closing Debit
 2018-07-27 11:13:00 +05:30
rohitwaghchaure
20d3bef3c3 [Fix] Deducted tax amount adding up in the total amount in the GST Itemised Purchase Register report (#14994) 2018-07-27 11:03:53 +05:30
mist-01
9821d51e31 Updated appointment availability to consider appointment duration in healthcare domain (#15011) 
* Updated appointment availability to consider appointment duration in healthcare domain.
Fix bug - must clone moment before adding time to avoid updating original moment

* Add spaces after comments
 2018-07-27 11:02:03 +05:30
Shreya Shah
1f4c263a63 [minor] Program Enrollment Tool (#15013) 
* Make academic term field mandatory

* Add disabled field to Student Group

* Mandatory check in Education Settings for Academic Term

* Fix as per review
 2018-07-27 10:59:14 +05:30
Shreya Shah
f71d18a35a Increase margin (#15016) 2018-07-27 10:57:32 +05:30
Nabin Hait
d0a2b1619b Optimization for marking student attendance 2018-07-27 10:51:55 +05:30
rohitwaghchaure
0fe6ced99d [Fix] Valuation rate for serialized items (#15017) 2018-07-27 10:33:30 +05:30