Rushabh Mehta
dbb5154f37
Fixes in Order / Quotation ( #10361 )
...
* Additions in Order Page for Sidebar Menu with "Order" page route
* Adjust Columns in order_taxes.html to avoid number breaks for more precisions
* Fields additions in transaction_row.html
* [fix] style for order pages, indicator for quotation etc
* [fix] style for order pages, indicator for quotation etc
* [test] add timeout
2017-08-10 21:06:09 +05:30
Saurabh
3a4b6c2cba
[fix] redirect to payment url if paying via web portal ( #10265 )
...
* [fix] redirect to payment url if paying via web portal
* [fix] test case fix
* [fix] test case fixes
2017-08-08 11:29:11 +05:30
mbauskar
2dd57acdef
removed merge conflicts
2017-08-02 18:39:04 +05:30
Faris Ansari
578624db1f
Fix column width in GST Tax Breakup ( #10230 )
2017-08-02 17:44:32 +05:30
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
