Commit Graph

750 Commits

Author SHA1 Message Date
Laurent Destailleur
2c0a01fc8c Merge remote-tracking branch 'origin/3.4' into develop 2013-07-11 17:57:06 +02:00
Laurent Destailleur
27a435994a Qual: Some methods object->addline used a first parameter that was
object->id, some not. Of course this was not a good pratice, since
object->id is already known so no need to provide it as parameter.
All methods addline in this case were modified to match good
pratice and be uniformed with others.
2013-07-10 17:29:54 +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
f67e52f42a Start to clean hook code 2013-07-09 21:40:45 +02:00
Florian Henry
95606dde04 Just update space into change log 2013-07-08 14:54:55 +02:00
Florian Henry
3db195cb48 [ bug #971 ] html.form.class.php select_contact with autocomplete do not
exclude id from exclude array
2013-07-08 12:51:17 +02:00
Florian Henry
b1b68eafe3 [ bug #972 ] Auto completion contact field do not take account the min
caract number before search
2013-07-08 12:47:07 +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
eef039e02f New: [ task #286 ] Enhance rounding function of prices to allow round of
sum instead of sum of rounding
2013-07-04 00:11:40 +02:00
Laurent Destailleur
33ed654745 New: Upgrade jquery flot library to 0.8.1 2013-07-03 03:40:59 +02:00
Laurent Destailleur
6f5a918373 New: Add option MAIN_MOTD_SETUPPAGE to add a content onto setup page.
Also content for MAIN_MOTD_SETUPPAGE, MAIN_MOTD_SETUPPAGE, MAIN_HOME
now accept "|langfile" into translation key to use a specific language
file.
2013-07-02 21:53:34 +02:00
Laurent Destailleur
d8883dba7f New: Add new graphical boxes (customer invoices per month). 2013-06-28 19:19:18 +02:00
Laurent Destailleur
af4651f1a2 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	build/perl/virtualmin/dolibarr.pl
	htdocs/core/lib/files.lib.php
	htdocs/langs/en_US/projects.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/public/paybox/paymentko.php
	htdocs/public/paybox/paymentok.php
	htdocs/public/paypal/paymentko.php
	htdocs/public/paypal/paymentok.php
	htdocs/webservices/server_other.php
2013-06-25 23:22:00 +02:00
Laurent Destailleur
8359a34545 Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
	ChangeLog
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/filefunc.inc.php
2013-06-25 21:31:24 +02:00
Laurent Destailleur
92306ca242 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-06-25 14:10:07 +02:00
Laurent Destailleur
2d0a85d6f8 New: Add option to send email when paypal or paybox payment is done. 2013-06-25 13:19:44 +02:00
simnandez
ca190be382 [Bug #958] LocalTax2 for Spain fails on Suppliers 2013-06-25 11:21:56 +02:00
simnandez
065b30f0d0 [Bug #958] LocalTax2 for Spain fails on Suppliers 2013-06-25 11:12:21 +02:00
Laurent Destailleur
a8547b5375 New: Add property hidden into module descriptor to allow to hide a
module according to some dynamic conditions.
2013-06-24 18:31:56 +02:00
Laurent Destailleur
ec2e3db450 New: Switch cron module to status stable. Thanks to everybody to test
this new module and debug it.
2013-06-23 22:21:21 +02:00
Marcos García
676191c1f9 Fix: [ bug #947 ] Can't create proposal lines with unit price = 0 2013-06-19 10:22:46 +02:00
Laurent Destailleur
02f1271fc4 New: Add option ADHERENT_LOGIN_NOT_REQUIRED 2013-06-14 01:30:43 +02:00
Florian Henry
fb0a99cb55 Fix [ bug #934 ] Impossible de créer une facture prédéfinie (pgsql) 2013-06-13 15:05:19 +02:00
Marcos García
13bcb5daaa Merge branch 'develop' into clone-composition
Conflicts:
	ChangeLog
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
2013-06-12 16:39:23 +02:00
Florian Henry
9f03074127 - New: [ task #926 ] Add extrafield feature on order lines
- New: [ task #927 ] Add extrafield feature on Proposal lines
- New: [ task #928 ] Add extrafield feature on invoice lines
2013-06-10 16:05:41 +02:00
Marcos García
e727100cf0 New: Clone product/service composition 2013-06-10 00:11:25 +02:00
Laurent Destailleur
89ee79f5cf New: Implement same rule for return value of all command line scripts (0
when success, <>0 if error).
2013-06-09 14:40:33 +02:00
Laurent Destailleur
e1f922b37b Update changelog 2013-06-09 12:49:05 +02:00
Laurent Destailleur
5a77828e62 New: Add object_hour as substitution tag for opendocument generation. 2013-06-08 18:12:32 +02:00
Laurent Destailleur
c3f5e0c6ee New: Show version of client lib used by mysql drivers 2013-06-07 19:19:11 +02:00
Laurent Destailleur
35fbc9b066 - New: Can enable tuning info from option MAIN_SHOW_TUNING_INFO. 2013-06-07 12:43:41 +02:00
Laurent Destailleur
81d6d5d51f Doc 2013-06-05 22:28:55 +02:00
Laurent Destailleur
eac4aa7e28 New: Module mailman can subscribe/unsubscribe to ML according to
categories of member.
2013-06-05 15:44:42 +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
6cf1d25529 Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
	ChangeLog
2013-06-03 11:09:40 +02:00
Marcos García
8ae0939ae5 Fixed bug #903: Fatal error: Call to undefined function dol_get_first_day() in htdocs/commande/liste.php 2013-06-01 15:39:45 +02:00
Laurent Destailleur
5bba5782a4 Merge remote-tracking branch 'origin/3.4' into develop 2013-05-29 21:22:27 +02:00
Laurent Destailleur
1cb33c43bd Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
	htdocs/comm/action/listactions.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/agenda.lib.php
	htdocs/product/liste.php
2013-05-29 01:30:36 +02:00
Christophe Battarel
5de7f77a09 update ChaneLog 2013-05-23 23:09:32 +02:00
Laurent Destailleur
e9df560b74 New: Show process id in all command line scripts 2013-05-22 12:23:42 +02:00
Laurent Destailleur
12681994ea Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/fichinter/fiche.php
2013-05-20 21:21:03 +02:00
Laurent Destailleur
71e14df62f Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
2013-05-20 17:37:08 +02:00
Christophe Battarel
fea0e6de54 Fix - external users should not see costprice and margin infos 2013-05-19 14:06:51 +02:00
fhenry
cbf29e20a2 [ task #901 ] Add Extrafeild on Fiche Inter 2013-05-18 13:00:36 +02:00
fhenry
fefb21a56e Fix bug on Extrafield checkbox
Fix bug on ActionComm Update
[ task #900 ] Review code of ficheinter.class.php
2013-05-18 12:17:43 +02:00
fhenry
faa2399b80 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop

Conflicts:
	ChangeLog

Change-Id: I7abbbefde190dbe86f8cb7ae43451da9eca1c9aa
2013-05-17 09:49:06 +02:00
Laurent Destailleur
fb92e13650 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	scripts/invoices/email_unpaid_invoices_to_customers.php
	scripts/invoices/email_unpaid_invoices_to_representatives.php
2013-05-15 22:35:41 +02:00
Laurent Destailleur
49735b8d39 New: Add option "filter=bank" onto script rebuild_merge_pdf.php to
merge PDF that has one payment on a specific bank account.
2013-05-15 17:52:56 +02:00
Laurent Destailleur
e95db78d50 New: Add script export-bank-receipts. 2013-05-15 13:41:31 +02:00
Laurent Destailleur
79d2dea26a Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
	htdocs/langs/en_US/errors.lang
	htdocs/langs/fr_FR/errors.lang
2013-05-14 03:04:42 +02:00