Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: fabiodr/erpnext
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: develop
Choose a base ref
...
head repository: fabiodr/erpnext
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: agri-farm-erpnext
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 18 commits
  • 86 files changed
  • 2 contributors

Commits on Oct 19, 2017

  1. created Soil Analysis, Water Analysis, Weather and Fertilizer doctype

    @codingCoffee
    codingCoffee committed Oct 19, 2017
    Configuration menu
    Copy the full SHA
    766ea4b View commit details
    Browse the repository at this point in the history

  2. soil doctype edited and crop doctype added

    @codingCoffee
    codingCoffee committed Oct 19, 2017
    Configuration menu
    Copy the full SHA
    fb46488 View commit details
    Browse the repository at this point in the history

  3. minor stuff

    @codingCoffee
    codingCoffee committed Oct 19, 2017
    Configuration menu
    Copy the full SHA
    3bc6c53 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2017

  1. Land Unit + Leaflet

    @vishalseshagiri @codingCoffee
    vishalseshagiri authored and codingCoffee committed Oct 23, 2017
    Configuration menu
    Copy the full SHA
    2b13c0f View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2017

  1. crop cycle added

    @vishalseshagiri @codingCoffee
    vishalseshagiri authored and codingCoffee committed Oct 24, 2017
    Configuration menu
    Copy the full SHA
    0d86652 View commit details
    Browse the repository at this point in the history

  2. Land Unit changes + Crop cycle

    @vishalseshagiri @codingCoffee
    vishalseshagiri authored and codingCoffee committed Oct 24, 2017
    Configuration menu
    Copy the full SHA
    5b8456e View commit details
    Browse the repository at this point in the history

  3. autoname for plant_analysis

    @codingCoffee
    codingCoffee committed Oct 24, 2017
    Configuration menu
    Copy the full SHA
    9bdec59 View commit details
    Browse the repository at this point in the history

  4. created Agriculture Task

    @codingCoffee
    codingCoffee committed Oct 24, 2017
    Configuration menu
    Copy the full SHA
    c631b46 View commit details
    Browse the repository at this point in the history

  5. minor stuff

    @codingCoffee
    codingCoffee committed Oct 24, 2017
    Configuration menu
    Copy the full SHA
    8add317 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2017

  1. - deleted agriculture_task 

    - current state after the call
    @codingCoffee
    codingCoffee committed Oct 25, 2017
    Configuration menu
    Copy the full SHA
    edc47fe View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of frappe/erpnext into 'agri-farm-erpnext' branch

    @codingCoffee
    codingCoffee committed Oct 25, 2017
    Configuration menu
    Copy the full SHA
    d8929ba View commit details
    Browse the repository at this point in the history

  3. [Agriculture] modified fertilizer doctype to have a link to Item 

    This was done so that the `Fertilizer` doctype could track the contents exclusive to the fertilizer, whereas the `Fertilizer Item` could be a seperate entity, so as to leverage the existing ERPNext doctypes
    @codingCoffee
    codingCoffee committed Oct 25, 2017
    Configuration menu
    Copy the full SHA
    be000b4 View commit details
    Browse the repository at this point in the history

  4. Merge pull request frappe#11336 from codingCoffee/agri-farm-erpnext 

    [Agriculture] modified fertilizer doctype to have a link to Item
    @codingCoffee
    codingCoffee authored Oct 25, 2017
    Configuration menu
    Copy the full SHA
    f1a55f1 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2017

  1. Added fields to Water Analysis doctype 

    - Collection Datetime
- Laboratory Testing Datetime
- Results Datetime (default to Laboratory Testing Datetime)
    @codingCoffee
    codingCoffee committed Oct 26, 2017
    Configuration menu
    Copy the full SHA
    4c06d10 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2017

  1. Edited the doctypes Agrivulture Task, Pest and Soil Texture 

    - Created `agriculture task` doctype
- added fields `Common Name`, `Scientific Name`, `Treatment` and `Treatment Options` to `Pest` doctype
- edited `Soil Texture` doctype to contain a soil texture ternary plot diagram made using SnapSVG. The code was put in public folder so as to be accessible by the entire agriculture module
    @codingCoffee
    codingCoffee committed Oct 28, 2017
    Configuration menu
    Copy the full SHA
    798c1e0 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2017

  1. Recursively reflect child land unit feature changes on parents

    @vishalseshagiri
    vishalseshagiri committed Oct 31, 2017
    Configuration menu
    Copy the full SHA
    b726c4c View commit details
    Browse the repository at this point in the history

  2. Merge pull request frappe#11390 from vishalseshagiri/agri-farm-erpnext 

    Recursively reflect child land unit feature changes on parents
    @codingCoffee
    codingCoffee authored Oct 31, 2017
    Configuration menu
    Copy the full SHA
    1d7140c View commit details
    Browse the repository at this point in the history

  3. Merge pull request frappe#11375 from codingCoffee/agri-farm-erpnext 

    edited water analysis, agriculture task, pest, soil texture
    @codingCoffee
    codingCoffee authored Oct 31, 2017
    Configuration menu
    Copy the full SHA
    8903cbb View commit details
    Browse the repository at this point in the history
Loading