2
0
forked from Wavyzz/dolibarr
Commit Graph

1927 Commits

Author SHA1 Message Date
Laurent Destailleur
d5a57f3717 Fix: Found a dozen of bugs into sub module delivery of module shipment. 2013-08-07 15:08:30 +02:00
Laurent Destailleur
60a1fce2d1 Sec: Do not autofill password for remote access 2013-08-06 17:26:05 +02:00
Laurent Destailleur
80e04e967c Start to uniformize default debian package with current official
package on work.
2013-08-06 03:10:51 +02:00
Laurent Destailleur
af026690d4 Fix: Bad sql requests 2013-08-01 12:22:05 +02:00
Maxime Kohlhaas
bfb01da04f Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko1011 2013-07-30 16:22:13 +02:00
Maxime Kohlhaas
5a38a43c87 Task # 1011 : now supplier order and invoice deal with payment terms and mode 2013-07-30 16:21:39 +02:00
Maxime Kohlhaas
dae36229a4 Task # 1011 : add payment terms and payment mode on supplier card 2013-07-30 15:06:57 +02:00
Cédric Salvador
6927274d2a copyright 2013-07-29 12:31:05 +02:00
Cédric Salvador
aae8a62368 added the desiredstock parameter in the SQL scripts 2013-07-29 12:31:04 +02:00
Laurent Destailleur
d802470aae I killed <td nowrap>. Hello <td class="nowrap"> ! 2013-07-19 14:23:42 +02:00
Laurent Destailleur
e3b38cf3bb Fix: SQL Syntax error.
Fix: A ref_ext can not be NOT NULL.
New: Add tms field into table llx_bordereau_cheque.
2013-07-19 14:09:17 +02:00
Laurent Destailleur
09fd904e76 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/ecm/index.php
2013-07-19 14:01:47 +02:00
Maxime Kohlhaas
7abc53698a Add RefExt field on RemiseCheque 2013-07-19 08:54:11 +02:00
Geoffrey
efacfc9aa3 Add Maghreb regions and departments 2013-07-18 16:49:56 +02:00
Florian Henry
0c0a64f532 [ task #924 ] Add numbering rule on task
[ task #925 ] Add ODT document generation for Tasks in project module
2013-07-18 10:24:45 +02:00
Florian Henry
ee82330292 On going sync/merge from other repo 2013-07-17 19:17:54 +02:00
Florian Henry
5329312dd3 Add table 2013-07-16 21:26:19 +02:00
Florian Henry
e07eac9b17 [ task #519 ] Add category association with contacts 2013-07-16 21:04:58 +02:00
Laurent Destailleur
f4dfac045a Fix: Bad default mysql driver 2013-07-14 20:20:52 +02:00
Maxime Kohlhaas
9d931b7b05 Task # 862 : ODT templates on shipment 2013-07-10 15:54:28 +02:00
Laurent Destailleur
a4abfe1abc New: Can add an event automatically when a projet is create. 2013-07-10 14:46:16 +02:00
Laurent Destailleur
8f71e5fda2 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
2013-07-07 23:25:03 +02:00
Laurent Destailleur
05461c47cc Fix: vat rate for slovenia 2013-07-07 23:22:00 +02:00
Laurent Destailleur
7c163f7be3 Fix: Running fixdosfile onto all project 2013-07-07 13:17:48 +02:00
Laurent Destailleur
7b5e0678db New: Make some changes to allow usage of alternative
$dolibarr_main_url_root variables.
Can now use several alternative path. Fix several bugs with all code.
2013-07-07 03:26:51 +02:00
Laurent Destailleur
5385d87995 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/ca_ES/errors.lang
	htdocs/langs/ca_ES/main.lang
	htdocs/langs/ca_ES/opensurvey.lang
	htdocs/langs/ca_ES/paybox.lang
	htdocs/langs/ca_ES/products.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/errors.lang
	htdocs/langs/es_ES/main.lang
	htdocs/langs/es_ES/products.lang
2013-07-05 21:56:54 +02:00
Laurent Destailleur
46c3b1eb1f Missing vat rate 2013-07-02 01:26:52 +02:00
Cédric Salvador
edc5de4f24 indentation 2013-07-01 15:42:14 +02:00
Cédric Salvador
96cea7b79a add the libname field in the migration script
Conflicts:
	htdocs/install/mysql/migration/3.4.0-3.5.0.sql
2013-07-01 15:42:14 +02:00
Cédric Salvador
aa4f2ba8fb made it possible to call a function from a library
Conflicts:
	htdocs/install/mysql/tables/llx_cronjob.sql
	scripts/cron/cron_run_jobs.php
2013-07-01 15:41:27 +02:00
Laurent Destailleur
17ed70230e Bad request 2013-07-01 11:45:09 +02:00
Laurent Destailleur
1c80f35080 Fix: Avoid duplicate of old lines 2013-06-30 22:19:36 +02:00
Florian Henry
1580f92b11 Fix bug for PGSQL Migration 3.4->3.5
Fix bug on create invoice from contract
2013-06-27 08:09:28 +02:00
Maxime Kohlhaas
b22b604d02 Accountancy code on user object in prevision of the complete accountancy module 2013-06-25 11:14:00 +02:00
Maxime Kohlhaas
109d1a71cb Merge 2013-06-25 11:00:48 +02:00
Regis Houssin
930f6e4850 Fix: avoid error with crlf 2013-06-24 18:04:06 +02:00
Regis Houssin
05bd035488 Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
Laurent Destailleur
7778a17a89 Qual: clean code from deprecated vars 2013-06-24 16:41:31 +02:00
Laurent Destailleur
71b61fc1f5 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/langs/fr_FR/mails.lang
	htdocs/user/logout.php
2013-06-18 09:51:37 +02:00
Laurent Destailleur
562fa43d9d Fix: Message is not clear enough.
Fix: Var was not initialized.
2013-06-17 23:24:53 +02:00
Laurent Destailleur
bc5fa5972a Drop deprecated tables 2013-06-14 02:26:24 +02:00
Florian Henry
4f43ec0acf Add extrafield tables 2013-06-10 14:13:44 +02:00
Laurent Destailleur
368efc77e0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-06-06 18:56:59 +02:00
Laurent Destailleur
4654e811b2 Close taks [ task #645 ]. We keep fields, just add comment into tables
with explanation of fields.
2013-06-06 18:54:17 +02:00
Regis Houssin
c9a71439b2 Fix: EOF 2013-06-05 16:24:32 +02:00
Laurent Destailleur
eadfa66f2c Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/core/class/infobox.class.php
2013-06-04 22:59:28 +02:00
Laurent Destailleur
c60e94c723 Merge pull request #1018 from fappels/develop
Added flemish legal forms to belgium entries
2013-06-03 14:43:35 -07:00
Laurent Destailleur
12973dbdb4 Look: Minor enhancement
Fix: Option to fix bug to send email on by default.
2013-06-03 22:06:28 +02:00
Laurent Destailleur
b4c5114ee6 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-03 19:26:01 +02:00
Laurent Destailleur
1ccde6ad04 Fix: syntax error 2013-06-03 19:25:12 +02:00