Commit Graph

11 Commits

Author SHA1 Message Date
Suraj Shetty
da2c69e836 fix(translations): Incorrect syntax 2020-01-29 15:34:06 +05:30
Suraj Shetty
146be9f6a6 Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes 2018-12-24 16:08:43 +05:30
Suraj Shetty
b2965001d1 Replace 'Make' with 'Create' 2018-12-23 13:25:58 +05:30
Ameya Shenoy
8075a576f9
Merge branch 'staging' into develop 2018-11-05 06:53:27 +00:00
Tyler Matteson
d14e46ef02 Doctypes in domains that are in beta are now restricted to that domain
non-profit, agriculture, healthcare, hospitality, education

Please enter the commit message for your changes. Lines starting
2018-11-04 08:39:52 -05:00
Suraj Shetty
bfc195dd8b Changes to support refactor in frappe pg-poc branch ()
* Remove quotes from sql to make it compatible with postgres as well

* Fix queries
- Replace mysql specifc queries with standard ones

* Make repo URL chages to test pg-poc

* Add root passowrd to test site config

* Fix quotes issue

* Remove debug flag from a pricing rule query

* Remove python 3.6 version from travis.yml

* Fix improper query issue

* Fix incorrect query

* Fix a query

- This fix need to be changed when we will  start supporting postgres
since date_format is not supported by postgres

* Get price list map as dict

* Convert price_list_currency_map to dict
2018-09-21 10:20:52 +05:30
Shreya Shah
a5add289bb Refactor Naming Series ()
* Patch to create Property Setter for existing naming series

* Update existing naming series options with new

* Add patch link to patches.txt

* Update patch

* Fix codacy

* Fix as per suggestions

* Remove old patch for property setter

* Improve as per suggested

- Modified the naming
- Also refactored naming for doctypes having autoname with series
- Added a patch to make property setter for autoname

* Fix Travis

* Rebase with develop
2018-08-28 13:44:48 +05:30
Achilles Rasquinha
96698c9a77 Use range instead xrange ()
* Use range instead of xrange

* convert float to int
2018-02-28 16:12:51 +05:30
Nabin Hait
e6d65bc2a1
Fixed translations and tests ()
* Fixed translations and tests

* minor fixes

* minor test fixes
2018-02-14 17:44:06 +05:30
Nabin Hait
bb821ec2af Fixed test dependencies 2018-02-13 14:49:09 +05:30
Revant Nandgaonkar
2dee8fc255 Hotels ()
* [new-module] hotels, start

* Multiple Changes

Hotel Settings Added
Make invoice on Hotel Reservation

* Hotel Room validation for overbooking

* Added test fixtures and test for Hotels

* Added Tests for Hotels

Overbooking
Pricing not set

* [WIP] Documentation

Hotel Room and Screenshot

* Added Calendar view for Hotel Room Reservation

* Added Report - Hotel Room Occupancy

* Added Hotel Reservation User in Hospitality domain
2018-02-12 11:57:12 +05:30