Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
This commit is contained in:
Regis Houssin
commit
1055cf4e53
@ -12,7 +12,10 @@ a package onto LaunchPad
|
||||
# To install all packagers tools:
|
||||
# sudo apt-get install bzr-builder bzr dpatch pbuilder debootstrap devscripts
|
||||
|
||||
|
||||
# Init local working env
|
||||
#----------------------------------
|
||||
|
||||
- Create account on launchpad.org
|
||||
- Create Project
|
||||
- Link project to official SCM server
|
||||
@ -21,32 +24,53 @@ a package onto LaunchPad
|
||||
- Run from command line:
|
||||
bzr launchpad-login yourlogin
|
||||
bzr whoami "Your Name <email@email.com>"
|
||||
- Create a file /.pbuilderrc with content
|
||||
bzr whoami
|
||||
- Create a file ~/.pbuilderrc with content
|
||||
COMPONENTS="main universe multiverse restricted"
|
||||
- Create chroot ubuntu env
|
||||
sudo pbuilder create [--distribution sid|squeeze]
|
||||
- Edit file ~/.bashrc ti add
|
||||
- Edit file ~/.bashrc to add
|
||||
DEBFULLNAME="<Your name>"
|
||||
DEBEMAIL="<Your email address>"
|
||||
|
||||
# Init package tools for launchpad
|
||||
|
||||
# Push/declare sources to Launchpad
|
||||
#----------------------------------
|
||||
|
||||
- Create a Bazaar directory
|
||||
mkdir bzr
|
||||
- Create debian directory and upload it onto bzr branch ~yourlogin/dolibarr/debian
|
||||
- Create a series
|
||||
Call it 'dev' or 'stable'
|
||||
Add file with *: http://www.dolibarr.org/files/stable/package_debian-ubuntu/dolibarr_3.2.*.tar.gz
|
||||
??? Configure Series branch - Link to series ???
|
||||
bzr init
|
||||
bzr add
|
||||
bzr commit -m "Init"
|
||||
bzr push lp:~eldy/dolibarr/stable
|
||||
|
||||
# Init package tools for launchpad
|
||||
#----------------------------------
|
||||
|
||||
- Create debian directory and upload it onto bzr branch ~yourlogin/+junk/debian-[dev|stable]
|
||||
cd bzr
|
||||
mkdir debian
|
||||
cd debian
|
||||
bzr init
|
||||
cp -pr dolibarr_root/debian bzr/debian
|
||||
bzr add debian
|
||||
bzr commit -m "Init"
|
||||
bzr push lp:~eldy/dolibarr/debian
|
||||
bzr init
|
||||
bzr add
|
||||
bzr commit -m "Init control files"
|
||||
bzr push lp:~eldy/+junk/debian-[dev|stable] (put here any branch name)
|
||||
or download it from launchpad bazaar:
|
||||
cd bzr
|
||||
bzr branch lp:~eldy/dolibarr/debian
|
||||
bzr branch lp:~eldy/+junk/debian-[dev|stable]
|
||||
- To update this debian directory, edit files into the bzr dir and run
|
||||
bzr status
|
||||
bzr commit -m "Description of change"
|
||||
bzr push lp:~eldy/dolibarr/debian
|
||||
bzr push lp:~eldy/+junk/debian-[dev|stable]
|
||||
|
||||
# Define a recipe into launchpad (a rule to build packages into a PPA)
|
||||
#----------------------------------
|
||||
|
||||
- Create a file dolibarr.recipe with content
|
||||
cd bzr
|
||||
vi dolibarr.recipe
|
||||
@ -61,7 +85,9 @@ DEBEMAIL="<Your email address>"
|
||||
sudo pbuilder build <working-dir>/<project>_<version>.dsc
|
||||
|
||||
|
||||
# To get/download package:
|
||||
# To get/download package from PPA:
|
||||
#----------------------------------
|
||||
|
||||
Add signing key of the Launchpad repository:
|
||||
> gpg --keyserver keyserver.ubuntu.com --recv-key A38BF8FD
|
||||
> sudo apt-key add ~/.gnupg/pubring.gpg
|
||||
|
||||
19
build/obs/README
Normal file
19
build/obs/README
Normal file
@ -0,0 +1,19 @@
|
||||
README (English)
|
||||
##################################################
|
||||
OBS Package tools
|
||||
##################################################
|
||||
|
||||
This directory contains files to explain how to publish
|
||||
a package onto OBS
|
||||
|
||||
|
||||
# Create a project onto OBS
|
||||
#----------------------------------
|
||||
https://build.opensuse.org
|
||||
|
||||
|
||||
Add attributes:
|
||||
OBS:Screenshots URL of screenshot
|
||||
OBS:QualityCategory Development|Testing|Stable|Private
|
||||
OBS:Maintained 1
|
||||
|
||||
@ -85,7 +85,7 @@ de Recursos Empresariales (ERP) y Gestión de la Relación con los
|
||||
Clientes (CRM) así como para para otras diferentes actividades.
|
||||
Dolibarr ha sido diseñado para suministrarle solamente las funcionalidades
|
||||
que necesita y haciendo hincapié en su facilidad de uso.
|
||||
|
||||
|
||||
%description -l fr
|
||||
Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs,
|
||||
artisans ou associations. Il permet de gérer vos clients, prospect,
|
||||
@ -117,7 +117,11 @@ cui hai bisogno ed essere facile da usare.
|
||||
|
||||
#---- install
|
||||
%install
|
||||
|
||||
%if 0%{?sles_version}
|
||||
%else
|
||||
%{__rm} -rf $RPM_BUILD_ROOT
|
||||
%endif
|
||||
|
||||
%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
|
||||
%{__install} -m 644 build/rpm/conf.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php
|
||||
@ -183,10 +187,9 @@ do
|
||||
fi
|
||||
done >>%{name}.lang
|
||||
|
||||
%if 0%{?suse_version}
|
||||
%if 0%{?suse_version} || 0%{?sles_version}
|
||||
# Enable this command to tag desktop file for suse
|
||||
%suse_update_desktop_file dolibarr
|
||||
|
||||
%suse_update_desktop_file dolibarr Office Finance
|
||||
# Enable this command to allow suse detection of duplicate files and create hardlinks instead
|
||||
%fdupes $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs
|
||||
%endif
|
||||
|
||||
@ -292,8 +292,8 @@ class Form
|
||||
{
|
||||
$tmp=explode(':',$inputType);
|
||||
$inputType=$tmp[0];
|
||||
$rows=($tmp[1]?$tmp[1]:'8');
|
||||
$cols=($tmp[2]?$tmp[2]:'80');
|
||||
$rows=(empty($tmp[1])?'8':$tmp[1]);
|
||||
$cols=(empty($tmp[2])?'80':$tmp[2]);
|
||||
}
|
||||
else if (preg_match('/^ckeditor/',$inputType))
|
||||
{
|
||||
|
||||
@ -189,7 +189,7 @@ class ProductFournisseur extends Product
|
||||
$sql.= " tva_tx = ".$tva_tx.",";
|
||||
$sql.= " fk_availability = ".$availability.",";
|
||||
$sql.= " entity = ".$conf->entity.",";
|
||||
$sql.= " charges = ".($charges != ''?price2num($charges):"null");
|
||||
$sql.= " charges = ".$charges;
|
||||
$sql.= " WHERE rowid = ".$this->product_fourn_price_id;
|
||||
// TODO Add price_base_type and price_ttc
|
||||
|
||||
@ -219,18 +219,20 @@ class ProductFournisseur extends Product
|
||||
{
|
||||
// Add price for this quantity to supplier
|
||||
$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price(";
|
||||
$sql.= "datec, fk_product, fk_soc, ref_fourn, fk_user, price, quantity, remise_percent, remise, unitprice, tva_tx, fk_availability, entity)";
|
||||
$sql.= "datec, fk_product, fk_soc, ref_fourn, fk_user, price, quantity, remise_percent, remise, unitprice, tva_tx, charges, unitcharges, fk_availability, entity)";
|
||||
$sql.= " values('".$this->db->idate($now)."',";
|
||||
$sql.= " ".$this->id.",";
|
||||
$sql.= " ".$fourn->id.",";
|
||||
$sql.= " '".$this->db->escape($ref_fourn)."',";
|
||||
$sql.= " ".$user->id.",";
|
||||
$sql.= " ".price2num($buyprice).",";
|
||||
$sql.= " ".$buyprice.",";
|
||||
$sql.= " ".$qty.",";
|
||||
$sql.= " ".$remise_percent.",";
|
||||
$sql.= " ".$remise.",";
|
||||
$sql.= " ".$unitBuyPrice.",";
|
||||
$sql.= " ".$tva_tx.",";
|
||||
$sql.= " ".$charges.",";
|
||||
$sql.= " ".$unitCharges.",";
|
||||
$sql.= " ".$availability.",";
|
||||
$sql.= $conf->entity;
|
||||
$sql.=")";
|
||||
|
||||
Loading…
Reference in New Issue
Block a user