Britlog
4c7709efbd
Portal breadcrumbs ( #10095 )
2017-07-28 18:54:22 +05:30
Rushabh Mehta
bead70b43a
Docs in website ( #10149 )
...
* [docs] move to erpnext.org
* [docs]
* [minor] add title
2017-07-28 11:44:08 +05:30
Faris Ansari
fbec103ae7
Remove inline styling, add css classes ( #10077 )
2017-07-26 18:46:13 +05:30
Vishal Dhayagude
edb2749dfd
Timesheet web ( #10037 )
...
* [new]Timesheet added
* [new] Customer wise timesheet on webportal added
2017-07-25 10:53:12 +05:30
Faris Ansari
e355f99786
Remove ellipsis in title and description ( #9992 )
2017-07-20 17:51:19 +05:30
Nabin Hait
b962fc1573
Show hsn code in tax breakup for India and render via template ( #9866 )
...
* Show hsn code in tax breakup for India and render via template
* tax breakup if gst_tax_field does not exists
* Fixed tax-breakup test cases
2017-07-17 18:02:31 +05:30
Faris Ansari
2c5b3e83f5
New design for daily work summary ( #9844 )
...
* New design for daily work summary
* Update tests
2017-07-13 18:37:18 +05:30
Nabin Hait
0a32b7a6eb
Set company address while making invoice from SO, don't show taxes in print if amount is zero, fixed state code
2017-07-12 19:21:05 +05:30
Nabin Hait
fa351f4bdf
Merge pull request #9433 from tundebabzy/issue-9424
...
Errors due to a single quote in Supplier's name #9424
2017-07-06 15:22:16 +05:30
mbauskar
ec252c806f
resolved merge conflicts
2017-06-29 12:11:07 +05:30
Makarand Bauskar
a938d3956a
[minor] get doc using party_name instead of party
2017-06-29 11:58:50 +05:30
Rushabh Mehta
02b0ed4199
[fix] update-gstin
2017-06-29 11:56:14 +05:30
Sagar Vora
1ef50c89db
[minor] use party_name instead of party and save GSTIN in uppercase
2017-06-28 23:52:22 +05:30
Makarand Bauskar
104eb8c6ad
[minor] render GSTIN value as "" instead of None
2017-06-27 18:59:35 +05:30
Rushabh Mehta
00ae424cac
[regional] ability to send gst reminders to all parties
2017-06-27 17:31:41 +05:30
tunde
dcd54209fc
parameterises sql string
2017-06-22 14:03:19 +01:00
Makarand Bauskar
8fac4314aa
Merge pull request #9373 from sagarvora/gh-9289
...
Check for align_labels_left before adding text-right class
2017-06-20 14:31:22 +05:30
Sagar Vora
89d60ca35e
Check for align_labels_left before adding text-right class
2017-06-20 14:16:06 +05:30
Britlog
faf75c4ddd
Fix and improve shopping cart ( #9348 )
...
* Fix and improve shopping cart
* Update shopping_cart.js
* Update shopping_cart.js
2017-06-20 12:51:32 +05:30
Nabin Hait
d0ac0bdc18
Merge branch 'master' into develop
2017-06-12 13:50:12 +05:30
Makarand Bauskar
665311b38a
[hotfix] replaced __ call with _ in project_timesheets.html ( #9198 )
2017-06-09 14:03:20 +05:30
Nabin Hait
2c808c578d
Merge branch 'master' into develop
2017-06-08 10:34:45 +05:30
rohitwaghchaure
6b95210c19
[Fix] User not able to view projects from the portal ( #9173 )
2017-06-07 20:03:37 +05:30
Faris Ansari
5f27c94100
Merge pull request #9078 from netchampfaris/remove-globals
...
Lint and fix JS files
2017-06-06 11:35:42 +05:30
Britlog
495a408db0
Fix contact form if email is both customer and lead ( #9075 )
2017-06-01 19:08:04 +05:30
Faris Ansari
ab74ca7fff
Lint and fix JS files
2017-05-30 12:54:42 +05:30
Nabin Hait
889e456dab
Merge branch 'master' into develop
2017-05-23 12:04:06 +05:30
Faris Ansari
2424aa73d7
Fix translated string in jinja ( #8956 )
2017-05-22 13:09:36 +05:30
Charles-Henri Decultot
2de1cd3529
View Attachments in portal ( #8830 )
...
* View Attachments in portal
* HTML beautify correction
* Move option to shopping cart settings
* new field in shopping cart settings for public attachments display in portal
2017-05-19 16:04:10 +05:30
KanchanChauhan
32cbbe5cc2
Website Specification Labls should not be capitalised by default ( #8798 )
2017-05-19 15:14:31 +05:30
Francisco Roldán
85bfc05efa
Fix missing translations ( #8871 )
...
* Fix missing translations
* Fix
2017-05-17 19:42:04 +05:30
Saurabh
62c7deee00
[fix] don't allow string values in limits to avoid sql injection ( #8779 )
2017-05-11 18:03:12 +05:30
Kanchan Chauhan
0633df5872
Item variant searchable in website products
2017-04-19 20:51:43 +05:30
mbauskar
22cedeb006
[minor] POS & RFQ format_number fixes
2017-04-17 12:24:24 +05:30
mbauskar
ed8ad9cfee
[minor] fides for add to card button issue
2017-04-13 18:45:09 +05:30
mbauskar
9a0efc7710
[minor] validate email address before get update button click
2017-04-13 18:18:18 +05:30
Rushabh Mehta
66272a168d
[minor] README.md + encode query parameter in search
2017-04-12 14:32:07 +05:30
Rushabh Mehta
9365641777
[added] frappe.safe_eval
2017-04-06 18:24:34 +05:30
Nabin Hait
00b04ed61e
Merge pull request #8076 from KanchanChauhan/qty-in-shopping-cart
...
Show qty in Shopping Cart
2017-03-24 13:14:03 +05:30
Kanchan Chauhan
a844040781
Show qty in Shopping Cart
2017-03-23 18:22:02 +05:30
Robert Kirschner
b8f5148a44
[minor] fix: translatable title, h1, button on product_search page. Address row in web view has translatable address type
2017-03-23 13:43:26 +01:00
Robert Kirschner
d162eb367c
[minor] fix translation strings in cart web view
2017-03-23 12:18:24 +01:00
Robert Kirschner
0af93a782d
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2017-03-23 12:10:46 +01:00
mbauskar
67e3e32dd6
[minor] fixed shipping and billing address issue in cart
2017-03-22 16:14:43 +05:30
Robert Kirschner
c6b52a321e
update on cart.js pull request feedback
2017-03-22 08:10:30 +01:00
Robert Kirschner
0a33d4ffc5
[fix] selecting new address in cart web page unchecks previously checked address
2017-03-21 14:52:59 +01:00
Nabin Hait
2bcacec5c6
Merge pull request #7576 from RobertSchouten/compact_dev
...
[fix] compact print format not longer ignores format builder
2017-02-24 13:09:18 +05:30
Nabin Hait
391eca18c7
Fixed merge conflict
2017-02-20 19:38:22 +05:30
Makarand Bauskar
98f9427ba1
[minor] minor fixes for contact us page
2017-02-20 12:41:48 +05:30
Nabin Hait
ea1cb68fe7
Merge branch 'master' into develop
2017-02-16 14:37:50 +05:30
pratu16x7
86415f394d
[minor] duration bar
2017-02-16 09:27:53 +05:30
pratu16x7
462e89e452
[minor] margin fix
2017-02-14 17:18:10 +05:30
pratu16x7
0e94b4bec4
Mobile view fixes
2017-02-14 17:18:09 +05:30
pratu16x7
60fe77cc90
Website data from existing child tables, layout, images
2017-02-14 17:18:09 +05:30
pratu16x7
dee36e10ae
Add operations and items to website
2017-02-14 17:18:09 +05:30
pratu16x7
aad8257e20
Add template
2017-02-14 17:18:09 +05:30
Kanchan Chauhan
1cd5e583ba
[Fix] Apply Now button redirect fixed for Job Opening
2017-02-10 17:58:41 +05:30
Rushabh Mehta
4500f7b4d6
[cleanup] remove unused LMS ( #7612 )
2017-01-30 17:04:38 +05:30
robert schouten
67eff49516
[fix] compact print format not longer ignores format builder
2017-01-25 08:20:43 +08:00
rohitwaghchaure
ab65f6d8b1
Merge pull request #7547 from mnatalia/develop
...
Added translations to the web page and item dashboard.
2017-01-23 15:57:33 +05:30
Rushabh Mehta
397e508fc0
[fix] sales_partner.js, fixes #7553
2017-01-21 16:58:57 +05:30
mnatalia
e09407571c
Added translations to the web page and item dashboard.
2017-01-20 12:00:25 +02:00
Felipe Orellana
ac81440a81
[FIX] Contact form breaks on existing lead
...
When an email address from the contacts form is from a existing lead utils.py tries to set new_lead(an undefined var) as the lead reference if a lead is found.
2017-01-12 12:08:20 -05:00
Rushabh Mehta
d40e661ebd
[style] better demo start page
2017-01-10 14:46:54 +05:30
Nabin Hait
d08c248642
Merge pull request #7354 from Scheercuzy/enlarge-item-image-website
...
Hyperlink on item image on website
2017-01-04 15:58:44 +05:30
Kanchan Chauhan
b7cc393eb8
Email ID renamed to Email Address
2017-01-03 16:45:38 +05:30
Scheercuzy
7c161cfff2
Merge remote-tracking branch 'frappe/develop' into enlarge-item-image-website
2017-01-03 16:03:43 +06:30
KanchanChauhan
4601fdd98d
Better Salary Slip logs in Process Payroll ( #7322 )
2016-12-30 16:26:55 +05:30
Scheercuzy
f483582957
Hyperlink Item Image
...
added hyperlink on item image
2016-12-29 18:56:44 +06:30
Rushabh Mehta
5cb1b6bf3f
[minor] translation fix
2016-12-27 16:30:20 +05:30
Rushabh Mehta
827588adf2
[minor] fixes to job opening
2016-12-19 17:06:26 +05:30
Rushabh Mehta
99c814b360
[fix] paging for products (support)
2016-12-19 11:55:10 +05:30
Rushabh Mehta
86f8ab95f6
[minor] font-awesome fixes
2016-12-05 15:02:24 +05:30
Rushabh Mehta
323c06ebbf
[minor] rename icons as per FontAwesome 4 ( #7136 )
2016-12-05 14:17:26 +05:30
Kanchan Chauhan
2c1f399479
Apply Pricing Rule in Shopping Cart
2016-11-22 22:23:31 +05:30
Nabin Hait
46753de6d7
fixed merge conflict
2016-11-17 15:55:11 +05:30
Kanchan Chauhan
98f499a43e
[Fix]Product thumbnail in Shopping Cart
2016-11-16 15:17:55 +05:30
Rushabh Mehta
4bfa0748cd
[merge] master
2016-11-16 11:28:23 +05:30
Rushabh Mehta
d51e1587d5
[fix] contact us page should create a opportunity by default ( #6939 )
2016-11-16 11:13:31 +05:30
Rushabh Mehta
440650d4a2
[fix] view shopping cart dropdown ( #6928 )
2016-11-14 13:13:53 +05:30
Rushabh Mehta
e855f53f08
[minor] fix ellipsis style
2016-11-02 07:34:17 +05:30
Nabin Hait
0702fa2fc6
Fixed version conflict
2016-10-19 16:49:36 +05:30
Faris Ansari
2acbb11923
[fix] print format image size
2016-10-19 12:08:00 +05:30
Rushabh Mehta
257bbbe588
[refactor] has_website_permission parameters
2016-10-12 10:53:34 +05:30
Rushabh Mehta
ac5b193100
[minor] direct student admission to the list page
2016-10-09 15:19:23 +05:30
Nabin Hait
558f526a68
Fixed version conflict
2016-10-05 17:18:36 +05:30
Nabin Hait
7c0fe7d9d3
Merge pull request #6534 from rohitwaghchaure/rfq_added_links_of_quotations
...
[Enhancement] Added supplier quotation link on rfq
2016-10-05 15:44:51 +05:30
Rohit Waghchaure
a26f685b9f
[Enhancement] Added supplier quotation link on rfq
2016-10-05 15:04:50 +05:30
Nabin Hait
7229b64128
Merge pull request #6516 from bcornwellmott/patch-6
...
Update request_for_quotation.html
2016-10-05 13:12:09 +05:30
Rushabh Mehta
3af3d7abe3
[fixes] admission-applicant link and student applicant fixes
2016-10-04 12:20:47 +05:30
Rushabh Mehta
aedad64445
[minor] fixes
2016-10-04 11:41:42 +05:30
Nabin Hait
7fb79d175f
Fixed version conflict
2016-10-03 18:05:34 +05:30
Faris Ansari
69ca382529
[fix] image size fix in print format
2016-10-03 17:15:42 +05:30
Neil Trini Lasrado
93d314c573
Merged introduction and eligibility into a single text field in Student Admission. ( #6529 )
2016-10-03 15:50:47 +05:30
bcornwellmott
47863a3049
Update request_for_quotation.html
...
Fixing spelling mistakes
2016-09-30 15:45:20 -07:00
Rushabh Mehta
2d4f3bb04a
[fix] space
2016-09-22 15:17:04 +05:30
Rohit Waghchaure
21499e820d
[Enhancement] Supplier quotation added on supplier portal
2016-09-21 17:07:25 +05:30
Nabin Hait
0be6073f10
Fixed version conflict
2016-09-21 13:06:19 +05:30
Nabin Hait
429a38f90b
Merge pull request #6415 from rmehta/hotfix
...
[minor] bring back old grid style in material request
2016-09-20 18:05:32 +05:30
Rushabh Mehta
57a1905576
[minor] bring back old grid style in material request
2016-09-20 17:22:54 +05:30
