Skip to content

Commit

Permalink
Renames registry to register which is correct term
Browse files Browse the repository at this point in the history
  • Loading branch information
Brice TEXIER committed Aug 21, 2015
1 parent c11fbc9 commit 39179e1
Show file tree
Hide file tree
Showing 40 changed files with 222 additions and 2,971 deletions.
2 changes: 1 addition & 1 deletion app/themes/tekyla/stylesheets/variables.scss
Expand Up @@ -86,7 +86,7 @@ $buttons-aliases: ("abort" "times") ("action" "cog") ("backup" "backward") ("bar
("observation" "comment-o") ("event" "calendar") ("task" "check-square-o") ("entity-link" "arrows-h") ("incoming-payment" "credit-card") ("outgoing-payment" "credit-card") ("issue" "bug") ("incoming-call" "call") ("outgoing-call" "call") ("incoming-email" "envelope-o") ("outgoing-email" "envelope-o") ("quote" "calculator") ("sale-opportunity" "file-text-o") ("sale" "eur") ("purchase" "shopping-cart") ("product-ownership" "key") ("product-localization" "map-marker") ("product-phase" "label") ("attachment" "paperclip")
("map" "map-marker") ("chart" "bar-chart") ("timeline" "history") ("cobbles" "view-stream")

("veterinary_booklet" "medkit") ("animal_husbandry_registry" "cow") ("doer" "male") ("exchange_accountancy_file_fr" "file") ("input" "matter") ("intervention_registry" "cogs") ("manure_management_plan" "book") ("provisional_manure_management_plan" "book") ("land_parcel_registry" "tractor") ("phytosanitary_registry" "flask") ("vine_phytosanitary_registry" "flask") ("general_ledger" "money") ("income_statement" "money") ("activity_cost" "money") ("tool" "tractor") ("wine_bottling_registry" "bottles") ("wine_detention_registry" "flask") ("wine_manipulation_registry" "bottle");
("veterinary_booklet" "medkit") ("animal_husbandry_register" "cow") ("doer" "male") ("exchange_accountancy_file_fr" "file") ("input" "matter") ("intervention_register" "cogs") ("manure_management_plan" "book") ("provisional_manure_management_plan" "book") ("land_parcel_register" "tractor") ("phytosanitary_register" "flask") ("vine_phytosanitary_register" "flask") ("general_ledger" "money") ("income_statement" "money") ("activity_cost" "money") ("tool" "tractor") ("wine_bottling_register" "bottles") ("wine_detention_register" "flask") ("wine_manipulation_register" "bottle");

$buttons-states: hover whited active disabled normal;
$buttons-radius: $default-border-radius;
Expand Down
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<aggregators xmlns="http://www.ekylibre.org/XML/2013/aggregators">
<aggregator name="animal_husbandry_registry" version="0.0" category="animal_farming">
<aggregator name="animal_husbandry_register" version="0.0" category="animal_farming">
<parameters>
<parameter name="campaigns" type="record-list" of="campaign" default="currents"/>
<parameter name="started_on" type="date" default="2013-01-01"/>
<parameter name="stopped_on" type="date" default="2013-12-31"/>
</parameters>
<section name="animal_husbandry_registry">
<section name="animal_husbandry_register">
<section name="enterprise">
<variable name="company" value="Entity.of_company"/>
<property name="entity_name" value="company.full_name"/>
Expand Down
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<aggregators xmlns="http://www.ekylibre.org/XML/2013/aggregators">
<aggregator name="intervention_registry" version="0.0" category="land_parcel_management">
<aggregator name="intervention_register" version="0.0" category="land_parcel_management">
<parameters>
<parameter name="campaigns" type="record-list" of="campaign" default="currents"/>
</parameters>
Expand Down
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<aggregators xmlns="http://www.ekylibre.org/XML/2013/aggregators">
<aggregator name="land_parcel_registry" version="0.0" category="land_parcel_management">
<aggregator name="land_parcel_register" version="0.0" category="land_parcel_management">
<parameters>
<parameter name="campaigns" type="record-list" of="campaign" default="currents"/>
</parameters>
Expand Down
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<aggregators xmlns="http://www.ekylibre.org/XML/2013/aggregators">
<aggregator name="phytosanitary_registry" version="0.0" category="land_parcel_management">
<aggregator name="phytosanitary_register" version="0.0" category="land_parcel_management">
<parameters>
<parameter name="campaigns" type="record-list" of="campaign" default="currents"/>
</parameters>
Expand Down
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<aggregators xmlns="http://www.ekylibre.org/XML/2013/aggregators">
<aggregator name="vat_registry" version="0.0" category="exploitation">
<aggregator name="vat_register" version="0.0" category="exploitation">
<parameters>
<parameter name="started_on" type="date" default="2014-01-01"/>
<parameter name="stopped_on" type="date" default="2015-12-31"/>
Expand Down
3 changes: 0 additions & 3 deletions config/locales/arb/aggregators.yml
Expand Up @@ -2,7 +2,6 @@ arb:
aggregator_parameters:
# campaigns: "Campaigns"
aggregator_properties:
# animal_husbandry_registry: "Animal husbandry registry"
# area: "Area"
# area_in_hectare: "Area in hectare"
# breeding_number: "Breeding number"
Expand Down Expand Up @@ -71,5 +70,3 @@ arb:
# variant_variety: "Variant variety"
# vine_yield: "Vine yield"
# wages: "Wages"
aggregators:
# vat_registry: "Vat tax registry"
18 changes: 9 additions & 9 deletions config/locales/arb/nomenclatures.yml
Expand Up @@ -1383,7 +1383,7 @@ arb:
document_natures:
items:
# activity_cost: "Activity cost"
# animal_husbandry_registry: "Animal husbandry registry"
# animal_husbandry_register: "Animal husbandry register"
# animal_list: "Animal list"
# animal_sheet: "Animal sheet"
# balance_sheet: "Balance sheet"
Expand All @@ -1395,17 +1395,17 @@ arb:
# general_ledger: "General ledger"
# income_statement: "Profit and loss statement"
# incoming_delivery_docket: "Incoming delivery docket"
# intervention_registry: "Intervention registry"
# intervention_register: "Intervention register"
# intervention_sheet: "Intervention sheet"
# inventory_sheet: "Inventory sheet"
# journal: "Journal"
# land_parcel_registry: "Land parcel registry"
# land_parcel_register: "Land parcel register"
# manure_management_plan: "Manure management plan"
# manure_management_plan_sheet: "Manure management plan (detail)"
# outgoing_deliveries_journal: "Outgoing deliveries journal"
# outgoing_delivery_docket: "Outgoing delivery docket"
# phytosanitary_certification: "Phytosanitary certification"
# phytosanitary_registry: "Phytosanitary registry"
# phytosanitary_register: "Phytosanitary register"
# prescription: "Prescription"
# products_sheet: "Products sheet"
# provisional_manure_management_plan: "Provisional manure management plan"
Expand All @@ -1420,12 +1420,12 @@ arb:
# stocks: "Stocks"
# tax_assessment: "Tax assessment"
# trial_balance: "Trial balance"
# vat_registry: "VAT registry"
# vat_register: "VAT register"
# veterinary_booklet: "Veterinary booklet"
# vine_phytosanitary_registry: "Vine phytosanitary registry"
# wine_bottling_registry: "Wine bottling registry"
# wine_detention_registry: "Wine detention registry"
# wine_manipulation_registry: "Wine manipulation registry"
# vine_phytosanitary_register: "Vine phytosanitary register"
# wine_bottling_register: "Wine bottling register"
# wine_detention_register: "Wine detention register"
# wine_manipulation_register: "Wine manipulation register"
# name: "Document natures"
property_natures:
# category: "Category"
Expand Down
12 changes: 6 additions & 6 deletions config/locales/eng/aggregators.yml
Expand Up @@ -25,7 +25,7 @@ eng:
#~ active: "Active"
#~ address: "Address"
#~ amount: "Amount"
animal_husbandry_registry: "Animal husbandry registry"
# animal_husbandry_register: "Animal husbandry register"
#~ animal_productions: "Animal productions"
area: "Area"
area_in_hectare: "Area in hectare"
Expand Down Expand Up @@ -166,13 +166,13 @@ eng:
#~ worker: "Worker"
aggregators:
#~ activity_cost: "Activity cost"
#~ animal_husbandry_registry: "Animal husbandry registry"
#~ animal_husbandry_register: "Animal husbandry register"
#~ exchange_accountancy_file_fr: "Exchange accountancy file fr"
#~ general_ledger: "General ledger"
#~ intervention_registry: "Intervention registry"
#~ land_parcel_registry: "Land parcel registry"
#~ phytosanitary_registry: "Phytosanitary registry"
#~ intervention_register: "Intervention register"
#~ land_parcel_register: "Land parcel register"
#~ phytosanitary_register: "Phytosanitary register"
#~ products_sheet: "Products sheet"
#~ income_statement: "Profit and loss statement"
vat_registry: "Vat tax registry"
#~ vat_register: "VAT register"
#~ veterinary_booklet: "Veterinary booklet"
18 changes: 9 additions & 9 deletions config/locales/eng/nomenclatures.yml
Expand Up @@ -1377,7 +1377,7 @@ eng:
category: "Category"
items:
activity_cost: "Activity cost"
animal_husbandry_registry: "Animal husbandry registry"
animal_husbandry_register: "Animal husbandry register"
animal_list: "Animal list"
animal_sheet: "Animal sheet"
balance_sheet: "Balance sheet"
Expand All @@ -1389,17 +1389,17 @@ eng:
general_ledger: "General ledger"
income_statement: "Profit and loss statement"
incoming_delivery_docket: "Incoming delivery docket"
intervention_registry: "Intervention registry"
intervention_register: "Intervention register"
intervention_sheet: "Intervention sheet"
inventory_sheet: "Inventory sheet"
journal: "Journal"
land_parcel_registry: "Land parcel registry"
land_parcel_register: "Land parcel register"
manure_management_plan: "Manure management plan"
manure_management_plan_sheet: "Manure management plan (detail)"
outgoing_deliveries_journal: "Outgoing deliveries journal"
outgoing_delivery_docket: "Outgoing delivery docket"
phytosanitary_certification: "Phytosanitary certification"
phytosanitary_registry: "Phytosanitary registry"
phytosanitary_register: "Phytosanitary register"
prescription: "Prescription"
products_sheet: "Products sheet"
provisional_manure_management_plan: "Provisional manure management plan"
Expand All @@ -1414,12 +1414,12 @@ eng:
stocks: "Stocks"
tax_assessment: "Tax assessment"
trial_balance: "Trial balance"
vat_registry: "VAT registry"
vat_register: "VAT register"
veterinary_booklet: "Veterinary booklet"
vine_phytosanitary_registry: "Vine phytosanitary registry"
wine_bottling_registry: "Wine bottling registry"
wine_detention_registry: "Wine detention registry"
wine_manipulation_registry: "Wine manipulation registry"
vine_phytosanitary_register: "Vine phytosanitary register"
wine_bottling_register: "Wine bottling register"
wine_detention_register: "Wine detention register"
wine_manipulation_register: "Wine manipulation register"
entity_link_natures:
name: "Entity link natures"
property_natures:
Expand Down
6 changes: 3 additions & 3 deletions config/locales/fra/aggregators.yml
Expand Up @@ -6,7 +6,7 @@ fra:
actor_name: "Nom de l'acteur" #?
animal_group_name: "Nom du groupe d'animaux" #?
animal_group_population: "Population du groupe d'animaux" #?
animal_husbandry_registry: "Registre d'élevage"
animal_husbandry_register: "Registre d'élevage" #?
area: "Surface"
area_in_hectare: "Surface (ha)"
breeding_number: "Numéro d'élevage"
Expand Down Expand Up @@ -91,5 +91,5 @@ fra:
variant_variety: "Variété de la variante"
vine_yield: "Rendement en vin"
wages: "Salaires"
aggregators:
vat_registry: "Bilan de TVA"
aggregators: #?
vat_register: "Registre de TVA" #?
18 changes: 9 additions & 9 deletions config/locales/fra/nomenclatures.yml
Expand Up @@ -1383,7 +1383,7 @@ fra:
document_natures:
items:
activity_cost: "Coût de production détaillé"
animal_husbandry_registry: "Registre d’élevage"
animal_husbandry_register: "Registre d’élevage"
animal_list: "Liste des animaux"
animal_sheet: "Fiche animal"
balance_sheet: "Bilan comptable"
Expand All @@ -1396,17 +1396,17 @@ fra:
general_ledger: "Grand livre"
income_statement: "Compte de résultat"
incoming_delivery_docket: "Bon de réception"
intervention_registry: "Registre des interventions"
intervention_register: "Registre des interventions"
intervention_sheet: "Fiche intervention"
inventory_sheet: "Inventaire"
journal: "Journal"
land_parcel_registry: "Cahier de tracabilité ‒ Parcelles"
land_parcel_register: "Cahier de tracabilité ‒ Parcelles"
manure_management_plan: "Cahier d’épandage"
manure_management_plan_sheet: "Plan prévisionnel de fumure détaillé"
outgoing_deliveries_journal: "Journal de livraison"
outgoing_delivery_docket: "Bon de livraison"
phytosanitary_certification: "Certi-Phyto"
phytosanitary_registry: "Registre phytosanitaire"
phytosanitary_register: "Registre phytosanitaire"
prescription: "Prescription vétérinaire"
products_sheet: "Fiche des produits"
provisional_manure_management_plan: "Plan prévisionnel de fumure (PPF)"
Expand All @@ -1421,12 +1421,12 @@ fra:
stocks: "Stocks"
tax_assessment: "Avis d’imposition"
trial_balance: "Balance comptable"
vat_registry: "Registre de TVA"
vat_register: "Registre de TVA"
veterinary_booklet: "Carnet vétérinaire"
vine_phytosanitary_registry: "Registre phytosanitaire ‒ Vigne"
wine_bottling_registry: "Registre de conditionnement ‒ Vin"
wine_detention_registry: "Registre de détention ‒ Vin"
wine_manipulation_registry: "Registre de manipulation ‒ Vin"
vine_phytosanitary_register: "Registre phytosanitaire ‒ Vigne"
wine_bottling_register: "Registre de conditionnement ‒ Vin"
wine_detention_register: "Registre de détention ‒ Vin"
wine_manipulation_register: "Registre de manipulation ‒ Vin"
name: "Types de documents"
property_natures:
category: "Catégories"
Expand Down
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="animal_husbandry_registry" language="groovy" pageWidth="595" pageHeight="842" columnWidth="539" leftMargin="28" rightMargin="28" topMargin="28" bottomMargin="28" isTitleNewPage="true" isSummaryNewPage="true" isSummaryWithPageHeaderAndFooter="true" whenResourceMissingType="Empty" uuid="9c1f11b7-03dd-4803-9e1b-41b87b9d23c0">
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="animal_husbandry_register" language="groovy" pageWidth="595" pageHeight="842" columnWidth="539" leftMargin="28" rightMargin="28" topMargin="28" bottomMargin="28" isTitleNewPage="true" isSummaryNewPage="true" isSummaryWithPageHeaderAndFooter="true" whenResourceMissingType="Empty" uuid="9c1f11b7-03dd-4803-9e1b-41b87b9d23c0">
<property name="ireport.zoom" value="0.6361464275587272"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="106"/>
Expand All @@ -16,22 +16,22 @@
<defaultValueExpression><![CDATA["/home/djoulin/ekylibre/config/locales/fra/reporting/"]]></defaultValueExpression>
</parameter>
<queryString language="xPath">
<![CDATA[/animal-husbandry-registry/campaign/animal-productions/production/animal]]>
<![CDATA[/animal-husbandry-register/campaign/animal-productions/production/animal]]>
</queryString>
<field name="entity_name" class="java.lang.String">
<fieldDescription><![CDATA[ancestor::animal-husbandry-registry/enterprise/@entity-name]]></fieldDescription>
<fieldDescription><![CDATA[ancestor::animal-husbandry-register/enterprise/@entity-name]]></fieldDescription>
</field>
<field name="plan_svg" class="java.lang.String">
<fieldDescription><![CDATA[ancestor::animal-husbandry-registry/campaign/plan/@plan-svg]]></fieldDescription>
<fieldDescription><![CDATA[ancestor::animal-husbandry-register/campaign/plan/@plan-svg]]></fieldDescription>
</field>
<field name="entity_address" class="java.lang.String">
<fieldDescription><![CDATA[ancestor::animal-husbandry-registry/enterprise/@address]]></fieldDescription>
<fieldDescription><![CDATA[ancestor::animal-husbandry-register/enterprise/@address]]></fieldDescription>
</field>
<field name="ede-cattling-number" class="java.lang.String">
<fieldDescription><![CDATA[ancestor::animal-husbandry-registry/enterprise/@ede-cattling-number]]></fieldDescription>
<fieldDescription><![CDATA[ancestor::animal-husbandry-register/enterprise/@ede-cattling-number]]></fieldDescription>
</field>
<field name="ede-owner-number" class="java.lang.String">
<fieldDescription><![CDATA[ancestor::animal-husbandry-registry/enterprise/@ede-owner-number]]></fieldDescription>
<fieldDescription><![CDATA[ancestor::animal-husbandry-register/enterprise/@ede-owner-number]]></fieldDescription>
</field>
<field name="animal_born_at" class="java.util.Date">
<fieldDescription><![CDATA[@born-at]]></fieldDescription>
Expand Down
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="intervention_registry" language="groovy" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="786" leftMargin="28" rightMargin="28" topMargin="28" bottomMargin="28" isTitleNewPage="true" whenResourceMissingType="Empty" uuid="9c1f11b7-03dd-4803-9e1b-41b87b9d23c0">
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="intervention_register" language="groovy" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="786" leftMargin="28" rightMargin="28" topMargin="28" bottomMargin="28" isTitleNewPage="true" whenResourceMissingType="Empty" uuid="9c1f11b7-03dd-4803-9e1b-41b87b9d23c0">
<property name="ireport.zoom" value="1.0"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="383"/>
<property name="com.jaspersoft.studio.data.defaultdataadapter" value="land_parcel_registry"/>
<property name="com.jaspersoft.studio.data.defaultdataadapter" value="land_parcel_register"/>
<template><![CDATA["/home/djoulin/ekylibre/config/corporate_identity/reporting_style.jrtx"]]></template>
<style name="Title" fontName="Open Sans" fontSize="30" isBold="true" pdfFontName="Open Sans"/>
<style name="SubTitle" forecolor="#736343" fontName="Open Sans" fontSize="18"/>
Expand Down
Expand Up @@ -3,7 +3,7 @@
<property name="ireport.zoom" value="1.0"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="448"/>
<property name="com.jaspersoft.studio.data.defaultdataadapter" value="land_parcel_registry"/>
<property name="com.jaspersoft.studio.data.defaultdataadapter" value="land_parcel_register"/>
<template><![CDATA["/home/djoulin/ekylibre/config/corporate_identity/reporting_style.jrtx"]]></template>
<style name="Title" fontName="Open Sans" fontSize="30" isBold="true" pdfFontName="Open Sans"/>
<style name="SubTitle" forecolor="#736343" fontName="Open Sans" fontSize="18"/>
Expand Down

0 comments on commit 39179e1

Please sign in to comment.