lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

2430 Commits

Author SHA1 Message Date
Laurent Destailleur
adb66eddf1 Fix generation of rpm packages 2016-02-06 18:15:54 +01:00
Laurent Destailleur
d85f7be1f5 FIX #4423 2016-02-03 02:06:12 +01:00
Laurent Destailleur
3dafe76f5e Complete changelog 2016-01-08 14:51:20 +01:00
Laurent Destailleur
0f7fd47a44 Clean changelog 2016-01-02 13:05:10 +01:00
Laurent Destailleur
0314b3b5b1 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
 2016-01-02 12:27:08 +01:00
Laurent Destailleur
8f0a004a58 Merge remote-tracking branch 'origin/3.7' into 3.8 2016-01-02 12:24:20 +01:00
Laurent Destailleur
e4640ca4c3 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/install/upgrade.php
 2016-01-02 12:22:00 +01:00
Laurent Destailleur
a2e93056f7 Prepare 3.8.3 2015-12-27 23:42:09 +01:00
Laurent Destailleur
f13df0f952 Prepare 3.7.3 2015-12-27 20:17:46 +01:00
Laurent Destailleur
a2c8208541 Prepare 3.6.5 2015-12-27 19:17:05 +01:00
Laurent Destailleur
c64eac5e72 Fix doc and mysql min version 2015-12-27 17:05:56 +01:00
Laurent Destailleur
065b7b6683 Fix ba alignement 2015-12-19 19:12:21 +01:00
Laurent Destailleur
e470869afe Prepare 3.9 2015-12-06 14:35:36 +01:00
Laurent Destailleur
d9533e9001 Prepare 3.9 2015-12-06 14:27:52 +01:00
Laurent Destailleur
0279e99b0a Update warning for mysql 5.5.4* bug 2015-12-06 12:04:34 +01:00
Laurent Destailleur
ab177b43af Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/.gitignore
	htdocs/comm/mailing/card.php
	htdocs/commande/list.php
	htdocs/compta/facture.php
	htdocs/expedition/class/expedition.class.php
 2015-11-13 12:35:10 +01:00
Laurent Destailleur
93be4305c4 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/supplier/card.php
	htdocs/accountancy/supplier/list.php
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/fichinter/card.php
	htdocs/societe/rib.php
 2015-11-13 12:18:46 +01:00
Laurent Destailleur
eac80d7db4 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	build/debian/changelog
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
 2015-11-13 11:43:29 +01:00
Laurent Destailleur
722a133b31 FIX Add a protection to not make release if ChangeLog was not generated. 
Prepare package 3.6.5

Conflicts:
	ChangeLog

Conflicts:
	ChangeLog
 2015-11-08 15:09:57 +01:00
Laurent Destailleur
9b8bb114cd FIX Add a protection to not make release if ChangeLog was not generated. 
Prepare package 3.7.2

Conflicts:
	ChangeLog
 2015-11-08 14:55:12 +01:00
Laurent Destailleur
c639e82062 FIX Add a protection to not make release if ChangeLog was not generated. 
Conflicts:
	ChangeLog
 2015-11-08 14:45:56 +01:00
Laurent Destailleur
6b98c50510 FIX Add a protection to not make release if ChangeLog was not generated. 2015-11-08 12:16:30 +01:00
Laurent Destailleur
972c364c37 FIX Add a protection to not make release if ChangeLog was not generated. 
Prepare package 3.8.2
 2015-11-08 12:12:28 +01:00
Laurent Destailleur
9f21ea58a3 A lot hooks used into PDF generation were not correctly implemented. We 
had to fix this. The result si that
the following hook were set as hook of type "replace". This means if
your module implement such hooks, it must 
return 0 to execute standard code or 1 to replace standard code (value
to output should be set into resPrints instead).
 2015-10-22 17:51:05 +02:00
Laurent Destailleur
b9001d7ab8 NEW Prepare database to store information per files (for example to 
define if an image ca, be used as a cover or not)
 2015-10-18 22:43:19 +02:00
Laurent Destailleur
b3491ef4e5 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/admin/facture_cust_extrafields.php
	htdocs/compta/facture/admin/facturedet_cust_extrafields.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
 2015-10-16 10:12:36 +02:00
Laurent Destailleur
8a02c8288b Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/product/index.php
 2015-10-16 09:56:55 +02:00
Laurent Destailleur
9b85a70013 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
 2015-10-16 09:52:38 +02:00
Laurent Destailleur
e6e4f0500d Update changelog 2015-10-11 20:32:24 +02:00
Laurent Destailleur
df39a1054e Fix 3.8.1 2015-10-11 20:19:52 +02:00
Laurent Destailleur
9fa2afb44b Merge branch '3.6' of github.com:Dolibarr/dolibarr into 3.6 
Conflicts:
	ChangeLog
 2015-10-11 19:55:50 +02:00
Marcos García de La Fuente
fd9f51df88 Missing changelog 2015-10-11 12:39:42 +02:00
Marcos García de La Fuente
9f1fa7e212 Missing changelog 2015-10-11 12:32:02 +02:00
Juanjo Menent
31230d296d Merge remote-tracking branch 'upstream/3.8' into develop 2015-10-03 23:51:38 +02:00
philippe grand
e22fb3c538 fix : Typo 2015-10-02 12:39:09 +02:00
philippe grand
8a9c9f49d5 fix : Typo 2015-10-02 12:37:13 +02:00
Laurent Destailleur
8ff41a8ded Enhance performance of option MAIN_OVERWRITE_TRANS_ 2015-09-17 15:35:51 +02:00
Laurent Destailleur
7fd01d4aa3 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/compta/paiement/cheque/class/remisecheque.class.php
	htdocs/product/class/html.formproduct.class.php
	htdocs/product/stock/index.php
	htdocs/product/stock/list.php
	htdocs/product/stock/mouvement.php
	htdocs/product/stock/product.php
	htdocs/product/stock/valo.php
 2015-09-09 12:45:22 +02:00
Juanjo Menent
c13d2d202b Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
 2015-09-08 21:08:59 +02:00
Laurent Destailleur
d19ec89bf1 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/modules/modHoliday.class.php
	htdocs/holiday/card.php
 2015-09-03 23:27:47 +02:00
Laurent Destailleur
c7b7dff0ed Merge branch 'bug-3460' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-3460

Conflicts:
	ChangeLog
 2015-09-03 19:14:37 +02:00
Laurent Destailleur
54214cfddf Merge branch 'bug-3383' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-3383

Conflicts:
	ChangeLog
 2015-09-03 19:12:01 +02:00
Laurent Destailleur
be9d5b030d Merge branch 'bug-3358' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-3358

Conflicts:
	ChangeLog
 2015-09-03 19:08:08 +02:00
Laurent Destailleur
b0f604da14 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 
Conflicts:
	ChangeLog
 2015-09-03 17:05:02 +02:00
Marcos García de La Fuente
ded6e7d6d9 Merge branch '3.7' into bug-3358 
# Conflicts:
#	ChangeLog
 2015-09-03 12:32:03 +02:00
Marcos García de La Fuente
2d5331b8f8 FIX [ #3460 ] Selected bank account was not saved when an error happened when trying to create a customer invoice 
Close #3460
 2015-09-03 12:13:03 +02:00
Marcos García de La Fuente
67b7162c59 Merge branch '3.7' into bug-3383 
# Conflicts:
#	ChangeLog
 2015-09-03 12:05:19 +02:00
Marcos García de La Fuente
86dd751f29 Merge branch '3.7' into bug-incorrect-pdf-bank 
# Conflicts:
#	ChangeLog
 2015-09-03 12:03:24 +02:00
Marcos García de La Fuente
0955432de3 Merge branch '3.7' into bug-iban-whitespaces-37 
# Conflicts:
#	ChangeLog
 2015-09-03 12:02:23 +02:00
Marcos García de La Fuente
7a115c9366 Typo 2015-09-03 11:59:46 +02:00
Marcos García de La Fuente
bd21cf5d68 Updated changelog 2015-09-03 11:58:20 +02:00
Marcos García de La Fuente
216827b1d8 FIX [ bug #3358 ] Tasks box does not work with PostgreSQL 
Close #358
 2015-09-01 11:26:59 +02:00
Marcos García de La Fuente
3134950dbe FIX [ bug #3383 ] Company name is overlapped with company direction in PDF models 
Close #3383
 2015-09-01 11:19:05 +02:00
Marcos García de La Fuente
c4f9bde14d FIX [ bug #3431 ] Invoice bank account is not respected 
Close #3431
 2015-09-01 11:09:37 +02:00
Marcos García de La Fuente
9ec349f410 FIX [ bug #3432 ] Spaces should be removed from IBAN when formatting it 
Close #3432
 2015-09-01 10:56:55 +02:00
Laurent Destailleur
00b9f98c1c Merge remote-tracking branch 'origin/3.7' into develop 2015-08-31 12:15:20 +02:00
Marcos García de La Fuente
b953d2c466 FIX [ bug #3426 ] Unable to create an invoice from a contract with extrafields 
Close #3426
 2015-08-29 19:42:51 +02:00
Laurent Destailleur
15ab9c0ecd Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/product/stock/mouvement.php
 2015-08-20 16:08:42 +02:00
Laurent Destailleur
259a4e0694 Update doc 2015-08-19 18:52:18 +02:00
Marcos García de La Fuente
b3a7b44046 FIX [ bug #3321 ] Users with certain permissions were shown a "forbidden access" page even if they had the rights 
Close #3321
 2015-08-14 12:29:32 +02:00
Laurent Destailleur
fc8a822f1d Merge remote-tracking branch 'origin/3.7' into develop 2015-08-13 04:03:23 +02:00
Laurent Destailleur
c73fe965d2 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
 2015-08-13 03:58:32 +02:00
Laurent Destailleur
1595765ec8 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2015-08-13 03:18:02 +02:00
Laurent Destailleur
dc4b429a33 Merge branch 'bug-3313' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-3313

Conflicts:
	ChangeLog
 2015-08-13 00:13:36 +02:00
Laurent Destailleur
4b51fc80a6 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 
Conflicts:
	ChangeLog
 2015-08-13 00:06:27 +02:00
Marcos García de La Fuente
02f4e9f5cb Merge branch '3.7' into bug-3211 
# Conflicts:
#	ChangeLog
 2015-08-11 10:12:36 +02:00
Juanjo Menent
c96573dcb4 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-08-10 20:29:36 +02:00
Juanjo Menent
b3f3cdda3a Merge remote-tracking branch 'origin/3.6' into 3.7 2015-08-10 20:16:05 +02:00
Marcos García de La Fuente
e2797ddd40 Merge branch '3.6' into bug-3342 
# Conflicts:
#	ChangeLog
 2015-08-10 17:48:18 +02:00
Marcos García de La Fuente
202d12ffef Merge branch '3.7' into bug-3211 
# Conflicts:
#	ChangeLog
 2015-08-10 17:42:38 +02:00
Juanjo Menent
97b69ab85e Merge remote-tracking branch 'origin/3.7' into 3.8 
# Conflicts:
#	htdocs/compta/paiement_charge.php
 2015-08-10 12:22:30 +02:00
Juanjo Menent
9374b4f3e3 Merge remote-tracking branch 'origin/3.6' into 3.7 2015-08-10 12:14:18 +02:00
Juanjo Menent
b2f5ae7aa8 Merge remote-tracking branch 'origin/3.7' into 3.8 
# Conflicts:
#	htdocs/core/boxes/box_task.php
 2015-08-10 11:09:22 +02:00
Marcos García de La Fuente
2f6587b48e FIX [ bug #3211 ] Error about sold to pay (Montant encours) 
Close #3211
 2015-08-09 18:08:22 +02:00
Marcos García de La Fuente
f3ef4fed93 Fix: [ bug #3313 ] Error enabling module with PostgreSQL database 
Close #3313
 2015-08-09 13:58:03 +02:00
Marcos García de La Fuente
7cb564586e Fix: [ bug #3310 ] OrderLine::fetch, FactureLigne::fetch and PropaleLigne::fetch do not return anything 
Close #3310
 2015-08-09 13:52:02 +02:00
Marcos García de La Fuente
2f921b6431 Fix [ bug #3342 ]: Taxes dictionary page does not accept localized decimals for localtax2 rate 
Close #3342
 2015-08-09 13:46:48 +02:00
Marcos García de La Fuente
a24f29ba8b Fix [ bug #3341 ]: Missing translation in /compta/paiement_charge.php 
Close #3341
 2015-08-09 13:37:05 +02:00
Marcos García de La Fuente
cccc543065 Fix: [ bug #3288 ] Tasks box is not properly drawn 
Close #3288
 2015-08-09 13:16:55 +02:00
Juanjo Menent
761c50a885 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-08-06 18:22:29 +02:00
fmarcet
62ad7d4d34 FIX: Not showing task extrafields when creating from left menu 2015-08-04 13:32:44 +02:00
Marcos García de La Fuente
a1f74763da Merge branch '3.5' into bug-3206 
Conflicts:
	ChangeLog
 2015-08-03 18:55:01 +02:00
Juanjo Menent
05b0a9b675 Merge remote-tracking branch 'origin/3.7' into 3.8 
# Conflicts:
#	htdocs/core/menus/standard/eldy.lib.php
 2015-08-01 14:50:07 +02:00
Laurent Destailleur
13dee1876a Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/resultat/clientfourn.php
 2015-07-30 15:07:22 +02:00
Laurent Destailleur
6adc3ba604 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
 2015-07-30 14:54:33 +02:00
Laurent Destailleur
ff8969073c Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/main.inc.php
 2015-07-28 18:57:13 +02:00
fmarcet
6676114501 Fix: Not showing product supplier reference when page break 2015-07-27 16:31:40 +02:00
fmarcet
e130af8033 Fix: Not showing delivery date on rouget pdf (expedition) 2015-07-27 13:11:07 +02:00
Laurent Destailleur
38d30b5590 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/fourn/facture/card.php
 2015-07-21 00:17:11 +02:00
Marcos García de La Fuente
038f171d6c Fix: [ bug #3074 ] Accruals accounting use payment date instead of commitment date in turnover reports for salaries 
Close #3074
 2015-07-20 12:18:30 +02:00
Marcos García de La Fuente
db54b6f596 Fix: [ bug #3198 ] Trigger LINECONTRACT_INSERT passes Contrat as $object instead of ContratLigne 
Created new ContratLigne::insert function

Close #3198
 2015-07-20 11:19:40 +02:00
Laurent Destailleur
dafe0a37cf Merge branch 'bug-1925' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1925

Conflicts:
	ChangeLog
 2015-07-19 15:31:02 +02:00
Laurent Destailleur
4f5e8e2480 Fix: missing context before calling trigger. 
Clean demo file with list of triggers.
 2015-07-19 15:24:54 +02:00
Marcos García de La Fuente
b64adcc065 FIX [ bug 1925 ] "Link to order" option in supplier invoices is not working properly 
Patch submitted by Philippe (pheno) at https://doliforge.org/tracker/?func=detail&aid=1925&group_id=144
 2015-07-19 15:13:27 +02:00
Marcos García de La Fuente
f2313748c8 Merge branch '3.7' into bug-1634 2015-07-19 14:57:39 +02:00
Marcos García de La Fuente
1be33e1dda FIX [ bug 1634 ] Error deleting a project when it had many linked objects 
Projet::delete was throwing DB error messages directly to the user instead of logging them and showing a proper error message to the user
 2015-07-19 14:56:52 +02:00
Marcos García de La Fuente
5b0c216b42 Merge branch '3.5' into bug-1791 
Conflicts:
	ChangeLog
 2015-07-19 13:48:04 +02:00
Marcos García de La Fuente
8505e91469 Fix: [ bug 1791 ] Margin menu not available if any Finance module is not enabled 2015-07-19 13:46:25 +02:00
Laurent Destailleur
2f2b0df6f8 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/contact/exportimport.php
	htdocs/contact/info.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/core/tpl/document_actions_pre_headers.tpl.php
	htdocs/langs/fr_FR/categories.lang
	htdocs/main.inc.php
	htdocs/product/reassort.php
	htdocs/projet/list.php
	htdocs/societe/info.php
 2015-07-19 12:26:31 +02:00
Laurent Destailleur
2bb1945a2f Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/prelevement/class/rejetprelevement.class.php
	htdocs/compta/sociales/class/paymentsocialcontribution.class.php
	htdocs/contact/exportimport.php
	htdocs/contact/ldap.php
	htdocs/contact/perso.php
	htdocs/contact/vcard.php
	htdocs/core/class/commonobject.class.php
	htdocs/product/reassort.php
	htdocs/projet/liste.php
	htdocs/societe/consumption.php
	htdocs/societe/info.php
 2015-07-19 12:04:30 +02:00
Laurent Destailleur
fbc0b5b313 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/contact/vcard.php
	htdocs/societe/consumption.php
 2015-07-19 11:38:44 +02:00
Laurent Destailleur
2e2f99c351 Merge branch 'bug-3180' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-3180

Conflicts:
	ChangeLog
 2015-07-19 11:28:48 +02:00
Laurent Destailleur
4100026c71 Merge branch 'bug-3268' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-3268

Conflicts:
	ChangeLog
 2015-07-19 11:27:28 +02:00
Laurent Destailleur
8d7c1f8d4c Fix: [ bug #2570 ] [Contacts] Page should not process if ID is invalid 2015-07-19 11:21:21 +02:00
Marcos García de La Fuente
3d6c5b09e8 Fix: [ bug #3268 ] SQL error when accessing thirdparty log page without a socid parameter 
Close #3268
 2015-07-19 11:19:47 +02:00
Marcos García de La Fuente
538c8c072b Merge branch '3.5' into bug-3180 
Conflicts:
	ChangeLog
 2015-07-19 11:16:36 +02:00
Marcos García de La Fuente
d0b1652efd Merge branch '3.5' into bug-3206 
Conflicts:
	ChangeLog
 2015-07-19 11:16:10 +02:00
Marcos García de La Fuente
4649cf7210 Fix: [ bug #3206 ] PropaleLigne, OrderLine and FactureLigne given to triggers through update function does not contain all the information 
Close #3206
 2015-07-18 19:40:48 +02:00
Marcos García de La Fuente
b28c4df0d6 Fix: [ bug #3180 ] formObjectOptions hook when editing thirdparty card does not print result 
Close #3180
 2015-07-18 17:35:36 +02:00
Marcos García de La Fuente
7185cfeb84 Fix: [ bug #2715 ] Statistics page has broken layout with long thirdparty names 2015-07-18 14:48:59 +02:00
Marcos García de La Fuente
e9d1e6265d Fix: [ bug #2696 ] Adding complementary attribute fails if code is numerics 
Close #2696
 2015-07-18 14:25:05 +02:00
Laurent Destailleur
3add8d5ca0 Update doc 2015-07-14 16:30:24 +02:00
Laurent Destailleur
fd7908d849 Update doc 2015-07-14 16:27:28 +02:00
Laurent Destailleur
08c38feb98 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
 2015-07-12 18:57:29 +02:00
Laurent Destailleur
1ba5afbc7d Update doc. Prepare 3.8 2015-07-12 18:56:00 +02:00
Laurent Destailleur
a7ea92fd6b Update doc. Prepare 3.8 2015-07-12 18:53:08 +02:00
Marcos García de La Fuente
cba902c5ae Fix: [ bug #3055 ] Product image thumbnails were not deleted after deleting the image 
Close #3055
 2015-07-07 09:40:23 +02:00
Regis Houssin
b70dfd0d54 New: possibility to defined a tab for all entities in module descriptor 2015-07-03 11:16:24 +02:00
Laurent Destailleur
0a2bafaa6d The trigger USER_LOGIN* are deprecated. They are still working but you 
should prefer use the hook afterLogin or afterLoginFailed instead.
 2015-06-27 21:52:23 +02:00
Regis Houssin
c05bf7e977 New: Possibility to add javascript in main login page with 
"getLoginPageOptions" hook
 2015-06-26 19:37:37 +02:00
Marcos García de La Fuente
d8b7f3618c Updated changelog 2015-06-16 21:20:42 +02:00
Laurent Destailleur
417eae9c4f Merge remote-tracking branch 'origin/3.7' into develop 2015-06-16 11:18:51 +02:00
Laurent Destailleur
85fee7ec49 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/product/class/product.class.php
 2015-06-16 11:18:10 +02:00
Laurent Destailleur
34468644ef Merge remote-tracking branch 'origin/3.5' into 3.6 2015-06-16 11:15:16 +02:00
Marcos García de La Fuente
2d3ab3b658 Merge remote-tracking branch 'upstream/3.5' into bug-2814-2 
Conflicts:
	ChangeLog
 2015-06-15 09:39:17 +02:00
Laurent Destailleur
87e07a3038 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
	htdocs/compta/bank/virement.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/product/card.php
	htdocs/societe/soc.php
 2015-06-14 17:18:45 +02:00
Laurent Destailleur
a7cec18081 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/categories/fiche.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/install/upgrade2.php
	htdocs/product/liste.php
 2015-06-14 17:11:36 +02:00
Laurent Destailleur
f4da53c300 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/product/liste.php
	htdocs/product/price.php
 2015-06-14 17:04:24 +02:00
Laurent Destailleur
fadc640335 Merge branch 'bug-2835' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-2835

Conflicts:
	ChangeLog
 2015-06-14 16:07:19 +02:00
Laurent Destailleur
d0b2c492a0 Merge branch 'bug-2837' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-2837

Conflicts:
	ChangeLog
 2015-06-14 16:06:14 +02:00
Laurent Destailleur
e915a54c39 Merge branch 'bug-2861' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-2861

Conflicts:
	ChangeLog
 2015-06-14 16:03:44 +02:00
Laurent Destailleur
892ff3b053 Merge branch 'bug-2900' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-2900

Conflicts:
	ChangeLog
 2015-06-14 15:58:16 +02:00
Marcos García de La Fuente
6514f418e5 Fix [ bug 1852 ] JS error when editing a customer order line 2015-06-13 11:46:35 +02:00
Marcos García de La Fuente
1215502927 Fix Close bug #2814 JPEG photos are not displayed in Product photos page 2015-06-13 03:11:17 +02:00
Marcos García de La Fuente
7bddca94ef Merge branch '3.7' into bug-2900 
Conflicts:
	ChangeLog
 2015-06-13 02:39:16 +02:00
Juanjo Menent
f068203a79 Update changelog 2015-06-12 21:31:14 +02:00
Marcos García de La Fuente
f9574fa458 FIX Close #2835 Customer prices of a product shows incorrect history order 2015-06-12 19:05:08 +02:00
Marcos García de La Fuente
2051a66cd7 FIX Close #2837 Product list table column header does not match column body 2015-06-12 18:46:05 +02:00
Marcos García de La Fuente
e3aa63f3c3 Added log 2015-06-12 18:33:37 +02:00
Marcos García de La Fuente
200eb7b1bb FIX Close bug #2855 Wrong translation key in localtax report page 2015-06-12 16:27:17 +02:00
Marcos García de La Fuente
300cfd2293 FIX Close bug #2891 Category hooks do not work 2015-06-12 16:10:23 +02:00
Marcos García de La Fuente
60711d35b8 FIX Close bug #2900 Courtesy title is not stored in create thirdparty form 2015-06-12 15:53:58 +02:00
Marcos García de La Fuente
87a00d6924 FIX Close bug #2976: "Report" tab is the current tab but it is not marked as selected by the UI 2015-06-12 15:02:05 +02:00
Laurent Destailleur
89f77f5e2b Uniformize code 2015-06-06 14:21:18 +02:00
Laurent Destailleur
43ed48896a Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/debian/changelog
	htdocs/filefunc.inc.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2015-06-05 18:31:53 +02:00
Laurent Destailleur
9753097731 Prepare 3.7.1 2015-05-31 18:45:01 +02:00
Laurent Destailleur
227f2842c2 Prepare version 3.7.1 2015-05-31 18:03:24 +02:00
Laurent Destailleur
fe3f701928 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	htdocs/expedition/list.php
	htdocs/filefunc.inc.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/user/class/user.class.php
 2015-05-16 17:09:42 +02:00
Laurent Destailleur
e4aaff1de9 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/debian/changelog
	build/makepack-dolibarr.pl
	build/makepack-howto.txt
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
	htdocs/product/class/product.class.php
 2015-05-16 17:01:40 +02:00
Laurent Destailleur
cabbb9e421 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	build/debian/changelog
	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
 2015-05-16 16:49:03 +02:00
Marcos García de La Fuente
190f12c4c4 Merge branch '3.5' into bug-2757 
Conflicts:
	ChangeLog
 2015-05-12 10:16:48 +02:00
Marcos García de La Fuente
ea7eb241e3 Close bug #2757 Deleting product category photo gives "Forbidden access" error 2015-05-12 10:15:43 +02:00
Laurent Destailleur
ac99f3aa8f Update changelog 2015-05-12 02:34:59 +02:00
Laurent Destailleur
83e4fe5d95 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/fourn/facture/list.php
 2015-05-12 00:09:03 +02:00
Laurent Destailleur
c2b31a37ba Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/contrat/fiche.php
	htdocs/core/modules/expedition/modules_expedition.php
	htdocs/expedition/class/expedition.class.php
	htdocs/expedition/fiche.php
	htdocs/user/fiche.php
 2015-05-11 23:53:38 +02:00
Laurent Destailleur
2a486f471b Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/product/class/product.class.php
 2015-05-11 23:39:45 +02:00
Marcos García de La Fuente
f8e8b39ff2 FIX #2758 Product::update sets product note to "null" when $prod->note is null 2015-05-10 01:27:28 +02:00
Laurent Destailleur
53bf90a3e2 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
 2015-04-28 21:54:13 +02:00
Juanjo Menent
ebe1f4a74d -Activate const PRODUCT_USE_OLD_PATH_FOR_PHOTOS by default for old 
instances
-Update changelog for 3.7.1

Conflicts:
	ChangeLog
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2015-04-27 20:31:12 +02:00
Juanjo Menent
93024830f5 -Activate const PRODUCT_USE_OLD_PATH_FOR_PHOTOS by default for old 
instances
-Update changelog for 3.7.1
 2015-04-27 20:22:03 +02:00
Laurent Destailleur
9ef809e91b Fix migration tools 2015-04-22 20:28:21 +02:00
Laurent Destailleur
100fa1067e Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/bank/virement.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modProjet.class.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/en_GB/admin.lang
	htdocs/langs/es_AR/orders.lang
	htdocs/langs/es_AR/trips.lang
	htdocs/langs/es_CO/admin.lang
	htdocs/langs/es_CO/orders.lang
	htdocs/langs/es_CO/trips.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/pl_PL/interventions.lang
	htdocs/langs/pt_BR/trips.lang
	htdocs/langs/ro_RO/productbatch.lang
	htdocs/langs/ro_RO/trips.lang
	htdocs/main.inc.php
	htdocs/projet/element.php
 2015-04-22 17:57:57 +02:00
Marcos García de La Fuente
ad5dd8e70f [ bug #1897 ] PHP Fatal error when editing Margin module settings with USER_UPDATE_SESSION trigger turned on 2015-04-20 01:36:48 +02:00
Laurent Destailleur
5b29c87933 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/deplacement/fiche.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/expedition/fiche.php
 2015-04-19 00:23:46 +02:00
Laurent Destailleur
ab77158757 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/expedition/fiche.php
 2015-04-18 23:55:17 +02:00
Laurent Destailleur
ed6abb0f79 Merge branch 'bug-2576' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2576 
Conflicts:
	ChangeLog
 2015-04-18 20:56:27 +02:00
Laurent Destailleur
b7cf0ded00 Merge branch 'bug-2577' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2577 
Conflicts:
	ChangeLog
 2015-04-18 20:12:27 +02:00
Laurent Destailleur
9b69b64626 Merge branch 'bug-2583' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2583 
Conflicts:
	ChangeLog
 2015-04-18 20:10:06 +02:00
Marcos García de La Fuente
8f0c41dbd2 Fix: [ bug #1905 ] Custom deplacement types do not get translated in deplacement card 2015-04-12 22:02:25 +02:00
Marcos García de La Fuente
6173706531 Fix: [ bug #1906 ] Deplacement does not allow translated decimal format 2015-04-12 21:55:20 +02:00
Marcos García de La Fuente
9cfb295675 Fix: Bug #2576 Unable to edit a dictionary entry that has # in its ref 2015-04-12 21:05:26 +02:00
Marcos García de La Fuente
bbd01c0c8d Fix: Bug #2577 Incorrect invoice status in "Linked objects" page of a project 2015-04-12 20:59:58 +02:00
Marcos García de La Fuente
728b64e334 Fix Bug #2583: Unable to create a bank transfer with localized numbers 2015-04-12 20:24:22 +02:00
Juanjo Menent
1f4a131691 Fix: Bad permission assignments for stock movements actions 
Conflicts:
	htdocs/product/stock/product.php
 2015-04-07 20:43:27 +02:00
Juanjo Menent
d7ba9b3312 Fix: Bad permission assignments for stock movements actions 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/product/stock/mouvement.php
 2015-04-07 20:40:48 +02:00
Juanjo Menent
9d8cb459f1 Fix: Bad permission assignments for stock movements actions 2015-04-07 20:28:45 +02:00
Juanjo Menent
c2bc2c9ea6 Solves #2542 Bug: Contracts store localtax preferences 
Conflicts:
	htdocs/compta/facture.php
 2015-04-07 20:10:27 +02:00
Juanjo Menent
1ab70a7086 Solves #2542 Bug: Contracts store localtax preferences 
Conflicts:
	htdocs/compta/facture.php
 2015-04-07 20:05:56 +02:00
Juanjo Menent
35a6ed90a0 Solves #2542 Bug: Contracts store localtax preferences 2015-04-07 20:02:12 +02:00
Juanjo Menent
a0de33912e Closes #2545 Bug: Missing object_margin.png in Amarok theme 
Conflicts:
	ChangeLog
 2015-04-07 18:57:45 +02:00
Juanjo Menent
2dfaf08f61 Closes #2545 Bug: Missing object_margin.png in Amarok theme 
Conflicts:
	ChangeLog
 2015-04-07 18:54:38 +02:00
Juanjo Menent
345b609ff0 Closes #2545 Bug: Missing object_margin.png in Amarok theme 2015-04-07 18:41:40 +02:00
Laurent Destailleur
a42eb7b787 Merge branch 'bug-2535' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2535 
Conflicts:
	ChangeLog
 2015-04-06 12:52:33 +02:00
Laurent Destailleur
8ce66aad79 Merge branch 'bug-2534' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2534 
Conflicts:
	ChangeLog
 2015-04-06 12:48:55 +02:00
Marcos García de La Fuente
5c8e92d52a Closes #2535 Bug: Untranslated string in "Linked objects" page of a project 2015-04-04 17:52:05 +02:00
Marcos García de La Fuente
50091dfe8b Closes #2534 SQL error when editing a supplier invoice line 2015-04-04 17:44:52 +02:00
Marcos García de La Fuente
40860a84d1 Closes #2543: Untranslated "Contract" origin string when creating an invoice from a contract 2015-04-04 17:28:24 +02:00
Laurent Destailleur
3844d4e6f7 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
	htdocs/core/boxes/box_activity.php
	htdocs/fourn/commande/card.php
	htdocs/user/card.php
 2015-03-23 15:16:37 +01:00
Laurent Destailleur
15ac0894c9 Prepare 3.7 release 2015-03-22 12:22:11 +01:00
Laurent Destailleur
cd2fc2f890 Hooks 'printLeftBlock' and 'formConfirm' are now compliant with hook 
development rules. They are "addreplace" hooks, so you must return
content with"->resprints='mycontent'" and not with "return 'mycontent'"
 2015-03-18 14:31:37 +01:00
Laurent Destailleur
dd82ad69fe printLeftBlock is now compliant with hook development rules. It is an 
"addreplace" hook so you must return content by doing
->resprints='mycontent' and not by doing return 'mycontent'
 2015-03-18 12:30:49 +01:00
Juanjo Menent
a63b1cf4c3 Fix: Showing system error if not enough stock of product into orders 
creation with lines

Conflicts:
	htdocs/commande/class/commande.class.php
 2015-03-14 09:57:28 +01:00
Juanjo Menent
4ae1106ffb Fix: Showing system error if not enough stock of product into orders 
creation with lines

Conflicts:
	htdocs/commande/class/commande.class.php
 2015-03-14 09:50:38 +01:00
Juanjo Menent
7cab558ed2 Fix: Showing system error if not enough stock of product into orders 
creation with lines
 2015-03-14 09:44:58 +01:00
Laurent Destailleur
687e3d250b Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	dev/fixdosfiles.sh
	htdocs/core/tpl/objectline_edit.tpl.php
 2015-03-13 17:46:31 +01:00
Laurent Destailleur
b47e16fbe9 Update changelog 2015-03-13 16:02:40 +01:00
Laurent Destailleur
a5645b626c Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/projet/element.php
 2015-03-11 03:55:46 +01:00
Laurent Destailleur
c1432eb2da Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/salaries/fiche.php
	htdocs/projet/element.php
 2015-03-11 03:29:52 +01:00
Marcos García
9a7346f889 Update ChangeLog 2015-03-06 12:09:23 +01:00
Laurent Destailleur
d119397129 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/societe/class/societe.class.php
 2015-03-05 11:38:16 +01:00
Laurent Destailleur
6c1c1fd691 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/lib/agenda.lib.php
	htdocs/fourn/paiement/fiche.php
 2015-03-05 11:35:39 +01:00
Laurent Destailleur
96de912661 NEW: Add module "Supplier commercial proposals" to requests 
quotation/price to suppliers.
Merge branch 'new_ask_price' of https://github.com/atm-ph/dolibarr into
atm-ph-new_ask_price

Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/tpl/document_actions_post_headers.tpl.php
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-04 17:54:43 +01:00
Marcos García de La Fuente
77605bce3e [ bug #1892 ] PHP Fatal error when using USER_UPDATE_SESSION trigger and adding a supplier invoice payment 2015-03-02 13:33:31 +01:00
Juanjo Menent
856c8f24de Fix: Bad SEPA xml file creation 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
 2015-02-27 18:14:45 +01:00
Juanjo Menent
88d1d203d8 Fix: Bad SEPA xml file creation 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
 2015-02-27 18:13:24 +01:00
Juanjo Menent
bfe9bf7a47 Fix: Bad SEPA xml file creation 2015-02-27 17:55:15 +01:00
Laurent Destailleur
6d3834b3b9 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/index.php
	htdocs/projet/class/project.class.php
	test/phpunit/BankAccountTest.php
 2015-02-23 14:59:24 +01:00
Laurent Destailleur
1ca4e377d5 Merge remote-tracking branch 'origin/3.6' into 3.7 2015-02-20 23:47:09 +01:00
Laurent Destailleur
56635cea98 Merge branch 'bug-1790' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1790

Conflicts:
	ChangeLog
 2015-02-20 23:23:57 +01:00
Laurent Destailleur
938936b8f2 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/core/lib/agenda.lib.php
	htdocs/core/lib/functions.lib.php
 2015-02-20 22:51:47 +01:00
Laurent Destailleur
e1e31de229 Merge remote-tracking branch 'origin/3.5' into 3.6 2015-02-20 20:15:04 +01:00
Laurent Destailleur
639aaebacb Merge branch 'bug-1825' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1825

Conflicts:
	ChangeLog
 2015-02-19 09:47:22 +01:00
Laurent Destailleur
94751ba57b Merge pull request #2361 from aspangaro/3.7-patch3 
[T1728] Deactivate RIB suggest in proposals/invoices/orders
 2015-02-19 09:41:39 +01:00
Laurent Destailleur
e3713c8b6d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/admin/tools/eaccelerator.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php
 2015-02-19 00:01:26 +01:00
Laurent Destailleur
774389940e Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/comm/propal/list.php
	htdocs/compta/bank/ligne.php
	htdocs/compta/resultat/clientfourn.php
	htdocs/compta/salaries/fiche.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/facture/paiement.php
 2015-02-18 23:51:41 +01:00
Laurent Destailleur
ead6b4bf95 Merge branch 'bug-1830' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1830

Conflicts:
	ChangeLog
 2015-02-18 22:50:12 +01:00
Laurent Destailleur
231c3f57d3 Merge pull request #2342 from aspangaro/3.6 
FIXED Correct typo on Changelog
 2015-02-18 22:47:03 +01:00
Laurent Destailleur
50142a1e6c Merge branch 'bug-1826' of https://github.com/marcosgdf/dolibarr into 
3.6

Conflicts:
	ChangeLog
 2015-02-18 22:46:24 +01:00
Laurent Destailleur
fc415fc3c9 Fix: [ bug #1826 ] Supplier payment types are not translated in 
fourn/facture/paiement.php
 2015-02-18 22:44:42 +01:00
Laurent Destailleur
6d25cf6f6a Merge branch 'bug-1832' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1832

Conflicts:
	ChangeLog
 2015-02-18 22:41:32 +01:00
Laurent Destailleur
23562a01ab Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/en_US/stocks.lang
 2015-02-16 20:59:04 +01:00
Laurent Destailleur
1e78d0e8d4 New: Introduce hidden option 
STOCK_WAREHOUSE_NOT_REQUIRED_FOR_SHIPMENTS to solve, with no risk, a
missing control on missing warehouse.
 2015-02-16 20:46:54 +01:00
Marcos García de La Fuente
6f08893016 Fix: [ bug #1846 ] Browser IE11 not detected 2015-02-16 12:26:20 +01:00
Marcos García de La Fuente
0a81fe667f Fix: [ bug #1825 ] External agenda: hide/show checkbox doesn't work 2015-02-16 10:44:10 +01:00
aspangaro
05dc308e91 [T1728] Deactivate RIB suggest in proposals/invoices/orders 2015-02-16 06:47:37 +01:00
Marcos García de La Fuente
5db4bb68a4 Updated bug name 2015-02-15 16:00:07 +01:00
Marcos García de La Fuente
2c074a94f3 Fix: [ bug #1790 ] Sending a test mail from admin page, gives "File already exists" error 2015-02-15 15:57:38 +01:00
Laurent Destailleur
689354f927 New: A default label is suggested for stock correction and transfer 
instead of empty string.
 2015-02-11 23:54:42 +01:00
Laurent Destailleur
e3885d6d73 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/lib/tax.lib.php
 2015-02-10 21:36:38 +01:00
Laurent Destailleur
ddb95e5765 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/comm/mailing/fiche.php
	htdocs/compta/paiement/liste.php
	htdocs/contact/class/contact.class.php
	htdocs/core/lib/tax.lib.php
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/langs/en_US/agenda.lang
	htdocs/webservices/server_contact.php
 2015-02-10 21:33:43 +01:00
Marcos García de La Fuente
6531a5c6c7 Fix: [ bug #1830 ] Salaries payment only allows checking accounts 2015-02-10 09:44:27 +01:00
aspangaro
f1d5e1ba7b FIXED Correct typo on Changelog 2015-02-10 07:14:55 +01:00
Marcos García de La Fuente
a9dc6bb3d7 Fix: [ bug #1826 ] Supplier payment types are not translated in fourn/facture/paiement.php 2015-02-10 00:55:22 +01:00
Marcos García de La Fuente
949f9e40a0 Fix: [ bug #1832 ] SQL error when adding a product with no price defined to an object 2015-02-10 00:20:47 +01:00
Marcos García de La Fuente
d9ac21ab82 Fix: [ bug #1822 ] SQL error in clientfourn.php report with PostgreSQL 2015-02-08 16:54:41 +01:00
Laurent Destailleur
e8b2b22c32 Merge branch 'bug-1827' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1827

Conflicts:
	ChangeLog
 2015-02-07 23:56:38 +01:00
Marcos García de La Fuente
b8b9df7b95 Fix: [ bug #1827 ] Tax reports gives incorrect amounts when using external modules that create lines with special codes 2015-02-06 12:36:09 +01:00
Laurent Destailleur
3bb6a5e8af Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 
Conflicts:
	ChangeLog
 2015-02-03 12:42:24 +01:00
Marcos García de La Fuente
0c63644038 Fix: [ bug #1819 ] SQL error when searching for an invoice payment 2015-02-01 13:26:30 +01:00
Marcos García de La Fuente
ef35483494 Fix: [ bug #1819 ] SQL error when searching for an invoice payment 2015-02-01 12:58:54 +01:00
Laurent Destailleur
770ddb6b0f Merge branch 'task-1793' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-task-1793

Conflicts:
	ChangeLog
	htdocs/margin/lib/margins.lib.php
 2015-01-31 14:29:15 +01:00
Laurent Destailleur
568d5cb5ba Fixed: Tracking number restored on PDF shipments 
Fixed: Translation

Conflicts:
	htdocs/langs/en_US/agenda.lang
 2015-01-23 18:47:47 +01:00
Laurent Destailleur
017a483eb3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-01-21 00:06:03 +01:00
Laurent Destailleur
449f2b9346 Merge branch 'delay-emailing' of https://github.com/marcosgdf/dolibarr 
into marcosgdf-delay-emailing

Conflicts:
	htdocs/comm/mailing/card.php
 2015-01-21 00:05:19 +01:00
Florian HENRY
ab50437331 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/html.form.class.php
 2015-01-19 09:38:00 +01:00
Laurent Destailleur
e220ce5a82 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/card.php
	htdocs/comm/propal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/custom/.gitignore
	htdocs/expedition/card.php
	htdocs/fourn/card.php
	htdocs/product/fournisseurs.php
 2015-01-18 18:44:22 +01:00
Laurent Destailleur
5c5ff72ecd Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/adherents/fiche.php
	htdocs/comm/fiche.php
	htdocs/comm/mailing/fiche.php
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/paiement.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/core/tpl/login.tpl.php
	htdocs/expedition/fiche.php
	htdocs/fourn/commande/fiche.php
	htdocs/fourn/facture/fiche.php
	htdocs/fourn/facture/paiement.php
	htdocs/fourn/fiche.php
	htdocs/main.inc.php
	htdocs/product/fournisseurs.php
	htdocs/resource/card.php
 2015-01-18 17:13:42 +01:00
Marcos García de La Fuente
c667f8734a [ task #1793 ] Create new permission to restrict commercial agent margin to logged user 2015-01-18 16:42:11 +01:00
Marcos García de La Fuente
fb186d6ef8 Added delay between mails in Newsletter module 2015-01-18 16:26:26 +01:00
Florian HENRY
22c253cfc1 add extrafield type, check box from table 2015-01-18 16:02:31 +01:00
Laurent Destailleur
08214999a7 Merge remote-tracking branch 'origin/3.5' into 3.6 2015-01-18 15:21:38 +01:00
Laurent Destailleur
7b7b8f376f Merge branch 'bug-1784' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1784

Conflicts:
	ChangeLog
 2015-01-18 15:13:26 +01:00
Laurent Destailleur
ff65035aee Merge branch 'bug-1717' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1717

Conflicts:
	ChangeLog
 2015-01-18 15:12:00 +01:00
Laurent Destailleur
d1e2ab6f56 Merge branch 'bug-1783' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1783

Conflicts:
	ChangeLog
 2015-01-18 15:10:30 +01:00
Laurent Destailleur
7c5927ef93 Merge branch 'bug-1796' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1796

Conflicts:
	ChangeLog
 2015-01-18 15:08:49 +01:00
Laurent Destailleur
b3e216b8f1 Merge branch 'bug-1787' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1787

Conflicts:
	ChangeLog
	htdocs/comm/propal.php
 2015-01-18 15:06:54 +01:00
Laurent Destailleur
c35de1aa06 Merge branch 'bug-1803' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1803

Conflicts:
	ChangeLog
 2015-01-18 15:01:18 +01:00
Laurent Destailleur
cef48d1275 Merge branch 'bug-1804' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1804

Conflicts:
	ChangeLog
 2015-01-18 14:02:52 +01:00
Laurent Destailleur
0513ce25e5 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 
Conflicts:
	ChangeLog
 2015-01-18 13:51:45 +01:00
Laurent Destailleur
05f08a7181 Merge branch 'bug-1762' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1762

Conflicts:
	ChangeLog
 2015-01-18 13:43:57 +01:00
Laurent Destailleur
b1f889e1d1 Merge remote-tracking branch 'origin/3.5' into 3.6 2015-01-18 12:46:23 +01:00
Laurent Destailleur
2f4352c759 Merge branch 'bug-1785' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1785

Conflicts:
	ChangeLog
 2015-01-18 12:45:05 +01:00
Laurent Destailleur
4639ce3364 Merge branch 'bug-1802' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1802

Conflicts:
	ChangeLog
 2015-01-18 12:37:16 +01:00
Florian HENRY
b407716175 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-01-18 11:57:32 +01:00
Marcos García de La Fuente
17b14eed88 Updated bug title 2015-01-18 02:55:59 +01:00
Marcos García de La Fuente
78905c6af1 Fix: [ bug #1784 ] « Message page de connexion » n'apparaît pas 2015-01-17 20:29:51 +01:00
Marcos García de La Fuente
003aa5ee44 Fix: [ bug #1717 ] Sorting unpaid invoices by amount received brings due amount 2015-01-17 19:41:31 +01:00
Marcos García de La Fuente
dacec491ff Fix: [ bug #1783 ] SQL error when enabling 3rd party module with PostgreSQL and MySQL strict mode ON 2015-01-17 19:37:49 +01:00
Marcos García de La Fuente
7f59cf9194 Fix: [ bug #1787 ] Incorrect behaviour of doActions hook 2015-01-17 19:28:27 +01:00
Marcos García de La Fuente
103a433bdf Fix: [ bug #1796 ] Unable to use numeration modules from an external module 2015-01-17 19:00:44 +01:00
Marcos García de La Fuente
068045f6a0 Fix: [ bug #1803 ] AJAX company contact input is not aligned 2015-01-17 18:23:20 +01:00
Marcos García de La Fuente
a64084308d Fix: [ bug #1804 ] SQL error when sending email without addresee 2015-01-17 18:12:43 +01:00
Laurent Destailleur
30abacd0a6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-01-17 14:42:42 +01:00
Laurent Destailleur
87a59ef527 Merge branch 'develop_bank_extrafields' of 
https://github.com/FHenry/dolibarr into FHenry-develop_bank_extrafields

Conflicts:
	htdocs/admin/bank.php
 2015-01-17 14:42:04 +01:00
Laurent Destailleur
8cd46e4830 Introduce option MAIN_HTML_TITLE to start to control format of html 
title content.
 2015-01-17 14:34:16 +01:00
Marcos García de La Fuente
61809ef6b5 - Fix: [ bug #1802 ] SQL error when updating a task with PostgreSQL database 2015-01-15 13:22:58 +01:00
Marcos García de La Fuente
88c3509dd0 Merge remote-tracking branch 'upstream/3.6' into 3.6 
Conflicts:
	ChangeLog
 2015-01-15 13:09:23 +01:00
Marcos García de La Fuente
71b609fab0 Fix: [ bug #1801 ] FAC_FORCE_DATE_VALIDATION constant alters supplier invoice date given to numeration modules 2015-01-15 13:08:33 +01:00
Juanjo Menent
1930d0677e Fix: withdrawal create error if in the same month are deleted previus 
withdrawals.

Conflicts:
	ChangeLog
 2015-01-15 10:02:42 +01:00
Juanjo Menent
f03ffaf5a3 Fix: withdrawal create error if in the same month are deleted previus 
withdrawals.

Conflicts:
	ChangeLog
 2015-01-15 10:00:52 +01:00
Juanjo Menent
d40eab2494 Fix: withdrawal create error if in the same month are deleted previus 
withdrawals.
 2015-01-15 09:57:20 +01:00
Laurent Destailleur
f92bc7986b Add Weighted average price as default price for buying price for margin 
calculation. Add option MARGIN_PMP_AS_DEFAULT_BUY_PRICE to replace
with first supplier price.
 2015-01-14 10:46:50 +01:00
Marcos García de La Fuente
4da52cf733 Fix: [ bug #1797 ] Tulip Supplier invoice module takes creation date instead of invoice date 2015-01-13 11:11:37 +01:00
Marcos García de La Fuente
85b1188593 Fix: [ bug #1788 ] Duplicated doActions hook in product/fournisseurs.php 2015-01-13 09:22:12 +01:00
Marcos García de La Fuente
6c4702f282 Fix: [ bug #1785 ] Start date is lost in Project > Linked objects 2015-01-13 09:11:04 +01:00
Marcos García de La Fuente
7e16d0c1d3 Fix: [ bug #1792 ] Users are not allowed to see margins module index page when no product view permission is enabled 2015-01-13 01:48:58 +01:00
Laurent Destailleur
90add2fa96 Fix: amarok is a bugged theme making dolidroid failed. We swith to 
eldy automatically with dolidroid.
 2015-01-10 17:23:52 +01:00
Laurent Destailleur
fc78d632d3 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/functions.lib.php
	htdocs/main.inc.php
 2015-01-09 23:09:10 +01:00
Laurent Destailleur
dbcaeb01c0 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/commande/class/commande.class.php
	htdocs/filefunc.inc.php
 2015-01-09 22:40:45 +01:00
Laurent Destailleur
068ae7f0d4 - Fix: ref_ext was not saved when recording a customer order from web 
service
 2015-01-09 22:32:00 +01:00
KreizIT
a7fc2b3779 Fix / Improve : [ bug #1747 ] Remove creation of batch 'Undefined' 2015-01-05 17:55:59 +01:00
Laurent Destailleur
5ead994955 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
 2014-12-26 04:57:55 +01:00
Laurent Destailleur
657fc1b91c Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/comm/fiche.php
	htdocs/core/lib/functions2.lib.php
	htdocs/fourn/fiche.php
	htdocs/langs/fr_FR/compta.lang
	htdocs/projet/element.php
	htdocs/projet/tasks/contact.php
	htdocs/projet/tasks/time.php
 2014-12-26 04:44:15 +01:00
Laurent Destailleur
d18770c1e7 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-12-26 04:16:08 +01:00
Laurent Destailleur
38c9d39c2b Merge branch 'bug-1757' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1757

Conflicts:
	ChangeLog
 2014-12-26 04:11:15 +01:00
Laurent Destailleur
4e2c321e4d Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 
Conflicts:
	ChangeLog
 2014-12-26 04:09:08 +01:00
Laurent Destailleur
5215b1e641 Merge pull request #2186 from marcosgdf/bug-575 
Fix [ bug #575 ] GED doesn't works if there is "/" in a mask
 2014-12-26 04:02:01 +01:00
Laurent Destailleur
bba8653179 Merge pull request #2183 from marcosgdf/bug-1724 
Fix: [ bug #1724 ] Can't add a submenu to projects
 2014-12-26 03:50:36 +01:00
Marcos García de La Fuente
8e47fe9e1c Fix: [ bug #1757 ] Sorting breaks product/service statistics 2014-12-26 00:19:09 +01:00
Marcos García de La Fuente
f4def9ea28 Fix: [ bug #1769 ] Error when installing to a PostgreSQL DB that contains numbers 2014-12-26 00:07:24 +01:00
Laurent Destailleur
f3fded2a0a Merge pull request #2171 from marcosgdf/bug-1649 
Fix: [ bug #1649 ] Cancel button of several thirdparty actions, does the same thing as modify
 2014-12-25 23:25:22 +01:00
Laurent Destailleur
224fa14e16 Merge branch 'bug-1731' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1731

Conflicts:
	ChangeLog
 2014-12-25 23:21:48 +01:00
Marcos García de La Fuente
c870f0e3db Updated changelog 2014-12-25 22:30:47 +01:00
Marcos García de La Fuente
146bba90e7 Fix: [ bug #1724 ] Can't add a submenu to projects 2014-12-25 18:42:26 +01:00
Marcos García de La Fuente
c050fe2a27 Merge branch '3.6' into bug-1649 
Conflicts:
	ChangeLog
 2014-12-25 01:27:57 +01:00
Marcos García de La Fuente
1179f722af Merge branch '3.7' into bug-1533 2014-12-25 01:26:00 +01:00
Juanjo Menent
73b47427d8 Update ChangeLog 2014-12-24 15:41:11 +01:00
Marcos García de La Fuente
294753dc47 Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some 
masks

Conflicts:
	htdocs/core/lib/functions2.lib.php
 2014-12-24 14:32:25 +01:00
Marcos García de La Fuente
b68276637b Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some 
masks

Conflicts:
	htdocs/core/lib/functions2.lib.php
 2014-12-24 14:31:17 +01:00
Juanjo Menent
c4a6377af5 Merge pull request #2169 from marcosgdf/bug-1736 
Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks
 2014-12-24 14:27:06 +01:00
Marcos García de La Fuente
416f13c708 Fix: [ bug #1752 ] Date filter of margins module, filters since 12H instead of 00H 2014-12-23 16:00:04 +01:00
Marcos García de La Fuente
8a14409974 Fix: [ bug #1533 ] Links triggers do not show trigger error message 2014-12-23 11:39:43 +01:00
Marcos García de La Fuente
3212fd2b27 Fix: [ bug #1649 ] Cancel button of several thirdparty actions, does the same thing as modify 2014-12-23 11:00:18 +01:00
Laurent Destailleur
56eddeade1 Fix merge changelog 2014-12-23 02:36:01 +01:00
Marcos García de La Fuente
db30186386 Fix: [ bug #1731 ] Can't use quick navigation on project tasks secondary tabs 2014-12-22 22:52:43 +01:00
Marcos García de La Fuente
46fe2c67e0 Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks 2014-12-22 22:32:05 +01:00
Laurent Destailleur
c3ac607e4f Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	dev/codesniffer/ruleset.xml
 2014-12-18 23:56:40 +01:00
Laurent Destailleur
c571013fc9 Merge remote-tracking branch 'origin/3.6' into 3.7 2014-12-18 23:55:07 +01:00
Florian HENRY
6f43206331 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-12-18 15:42:44 +01:00
Florian HENRY
c209d16881 [ bug #1749 ] Undefined $mailchimp 2014-12-18 15:42:28 +01:00
Laurent Destailleur
4769e26d8e Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
 2014-12-18 12:34:41 +01:00
Laurent Destailleur
ef5035b349 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/product/liste.php
 2014-12-18 11:42:55 +01:00
Laurent Destailleur
2c01a46774 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
	htdocs/paypal/lib/paypal.lib.php
 2014-12-18 10:13:25 +01:00
Laurent Destailleur
1461072801 Fix: Paypal link were broken dur to SSL v3 closed. 2014-12-09 01:12:52 +01:00
Laurent Destailleur
c731321024 New: Function yn can show a visual checkbox 2014-12-07 01:57:23 +01:00
Juanjo Menent
fe23a851e7 Fix: datepicker first day of week can be monday by setting into 
display setup
 2014-12-06 11:03:48 +01:00
Juanjo Menent
430b2ff8db Fix: datepicker first day of week can be monday by setting into 
display setup
 2014-12-06 11:00:49 +01:00
Florian HENRY
99f817b69a - New: Add Option to not change date on cloning project 2014-12-05 21:40:55 +01:00
Laurent Destailleur
8d405a147f Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/debian/changelog
	htdocs/core/tpl/objectline_create.tpl.php
 2014-12-04 15:29:45 +01:00
Laurent Destailleur
a07852c699 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
 2014-12-04 15:22:08 +01:00
Laurent Destailleur
9e1b0d1abc Prepare 3.5.6 2014-12-04 15:09:47 +01:00
Laurent Destailleur
9c2485c469 Better explanation 2014-12-04 13:25:20 +01:00
Laurent Destailleur
da841e28cd Add warning 2014-11-30 01:39:24 +01:00
Laurent Destailleur
df9a6dae6c Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fichinter/fiche.php
 2014-11-28 02:20:01 +01:00
Francis Appels
b1a4b8e7d0 Fix: [ bug #1624 ] POS set buy price for margin 
Use lowest buying price for margin when selling with POS or external
module. A POS user does not worry about suppliers.
 2014-11-25 21:20:13 +01:00
Francis Appels
18406fc550 Fix: Show sender Country on PDF docs 
Show sender Country on PDF docs when sender Country != receiver Country
 2014-11-25 14:26:45 +01:00
Marcos García de La Fuente
7a272afd12 Fixed [ bug #1595 ] Selected boolean extrafield in intervention creation page, does not save state 2014-11-23 16:03:49 +01:00
Laurent Destailleur
425a853e07 - New: Match other auth system: Login can be done entering login or 
user email (this open the road for SSO).
 2014-11-14 11:56:05 +01:00
Juanjo Menent
2f30e769f6 Fix: [ bug #1535 ] Supplier invoice Extrafields are not shown 2014-11-06 22:16:27 +01:00
Laurent Destailleur
5e0946bdc2 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/adherents/fiche.php
	htdocs/core/lib/date.lib.php
	htdocs/langs/fr_FR/bills.lang
	htdocs/resource/class/resource.class.php
 2014-11-05 16:37:07 +01:00
Laurent Destailleur
4f08408065 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	ChangeLog
	htdocs/core/class/commonobject.class.php
 2014-11-05 16:28:44 +01:00
Laurent Destailleur
ca69bf9d7e Fix: Infinite loop 2014-11-02 21:20:24 +01:00
Laurent Destailleur
53dfda1413 Fix: Chars - is no more allowed into value for code for extra fields. 2014-11-01 19:34:20 +01:00
Laurent Destailleur
d5f21caca6 Update doc 2014-10-30 18:19:41 +01:00
Laurent Destailleur
e3041f45ee Update changelog 2014-10-30 18:08:42 +01:00
Laurent Destailleur
fb4858a5d3 Update changelog 2014-10-30 18:07:09 +01:00
Laurent Destailleur
e607a53ca3 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 
Conflicts:
	ChangeLog
 2014-10-30 17:53:38 +01:00
Laurent Destailleur
5ec2c1c4b3 Merge branch '3.6-patch' of github.com:aspangaro/dolibarr into 
aspangaro-3.6-patch

Conflicts:
	ChangeLog
 2014-10-30 17:52:08 +01:00
Laurent Destailleur
a5700c8f44 Ajout log 2014-10-30 12:20:48 +01:00
Laurent Destailleur
3ffd4432df New: Add permissions to read all trips and expenses. 2014-10-30 11:43:57 +01:00
Laurent Destailleur
8821fbac76 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/product/fiche.php
	htdocs/user/class/user.class.php
 2014-10-30 11:19:29 +01:00
Laurent Destailleur
a0c9af2385 New: Can filter on date into tab "Referring object" of a project. 2014-10-29 20:21:24 +01:00
Florian HENRY
834a6dc2af webservice Thirdparty parameter lastname for invidual creation is now 
lastname and not ref
 2014-10-28 16:50:44 +01:00
Laurent Destailleur
badf379489 Fix: [ bug #1618 ] PHP Error thrown when saving a barcode 2014-10-27 01:56:06 +01:00
aspangaro
1405c03f7d Fix: Civility & birthdate wasn't save into adherent module 2014-10-26 06:48:08 +01:00
Laurent Destailleur
0fc1c85b34 New: Module notification has been enhanced: 
EMail use now language of target contact.
Can also define a fixed email for notifications.
Better error management
 2014-10-25 00:42:52 +02:00
Laurent Destailleur
4d515d660c New: Feature to link manually an order to an invoice does not disappear 
once link has been done.
 2014-10-24 14:17:36 +02:00
Laurent Destailleur
4a60d57544 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/product/fiche.php
	htdocs/product/liste.php
 2014-10-18 21:08:09 +02:00
Laurent Destailleur
48b2d818da Update changelog 2014-10-18 16:29:22 +02:00
Laurent Destailleur
e53c328767 Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into 
aspangaro-develop-favorite

Conflicts:
	ChangeLog
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-10-18 15:45:44 +02:00
Laurent Destailleur
ad0f842b60 Merge branch 'mkoevols' of github.com:atm-maxime/dolibarr into 
atm-maxime-mkoevols

Conflicts:
	htdocs/commande/card.php
 2014-10-18 15:38:49 +02:00
Laurent Destailleur
6bbeaee8fe Fix: Selection of users color was not user owner of event. 2014-10-18 15:35:32 +02:00
aspangaro
9f6a460d42 Merge remote-tracking branch 'Upstream/develop' into develop-favorite 
Resolve conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-10-18 15:32:50 +02:00
Laurent Destailleur
c8dd0383d8 New: Function getCurrencyAmount is marked as deprecated. Use function 
price to output a price including currency symbol.
 2014-10-16 01:26:44 +02:00
Maxime Kohlhaas
850771206d Changelog :) 2014-10-14 17:12:45 +02:00
aspangaro
861583bb77 Merge remote-tracking branch 'Upstream/develop' into develop-favorite 2014-10-14 06:12:46 +02:00
Laurent Destailleur
f498921715 Merge branch 'droposcommerce' of github.com:GPCsolutions/dolibarr into 
GPCsolutions-droposcommerce

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/vi_VN/admin.lang
	htdocs/langs/vi_VN/shop.lang
 2014-10-13 00:50:51 +02:00
aspangaro
dc6817813e Merge remote-tracking branch 'Upstream/develop' into develop-favorite 2014-10-12 20:23:08 +02:00
Laurent Destailleur
8df8fb2fe0 Qual: Removed a lot of duplicate code 
New: extrafields for projects and tasks are exported to ODT documents.
 2014-10-12 16:19:00 +02:00
Laurent Destailleur
455bae98ef Fix: box of customer and propsects were not correctly disabled. 2014-10-12 15:49:29 +02:00
aspangaro
dad9a54959 Merge remote-tracking branch 'Upstream/develop' into develop-favorite 2014-10-12 15:47:29 +02:00
aspangaro
71dafac03c Add favorite button into country dictionary to put value on top select list 2014-10-12 15:28:01 +02:00
Laurent Destailleur
65f47f7d10 New: Add number of active notification into tab title (like we do for 
notes and documents)
 2014-10-12 12:22:45 +02:00
Laurent Destailleur
9768550696 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
	htdocs/categories/fiche.php
	htdocs/comm/action/index.php
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fourn/fiche.php
	htdocs/product/composition/fiche.php
	htdocs/product/price.php
	htdocs/projet/tasks/task.php
	htdocs/projet/tasks/time.php
 2014-10-12 02:54:34 +02:00
Laurent Destailleur
c30f13a03d Fix: label of input method not translated. 2014-10-12 02:07:50 +02:00
Laurent Destailleur
ac2ff5c604 Update logs 2014-10-12 01:40:18 +02:00
Laurent Destailleur
c184253951 Update doc 2014-10-11 23:56:45 +02:00
Laurent Destailleur
f9377a4715 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-10-08 20:57:11 +02:00
Laurent Destailleur
2bbede6465 New: Can add product into category from category card. 2014-10-07 21:39:10 +02:00
Laurent Destailleur
11d1be882c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/contrat/list.php
 2014-10-04 17:32:01 +02:00
Laurent Destailleur
5601c979ab New: Can search list of thirdparties from web service on part of name. 2014-10-04 17:29:04 +02:00
Laurent Destailleur
b85a835988 Prepare 3.6.1 2014-10-03 19:03:58 +02:00
Florian HENRY
4b28ff005e Return error message on category creation failure 2014-10-02 15:24:40 +02:00
Florian HENRY
78ec4d595b Fix trad currency 2014-10-02 15:21:49 +02:00
Florian HENRY
46f673fb5f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/fourn/card.php
 2014-09-29 16:01:49 +02:00
Laurent Destailleur
c6fc07e412 Merge pull request #1926 from fmarcet/3.6 
Fix: Withdrawal total amount is double
 2014-09-29 15:41:59 +02:00
Raphaël Doursenaud
f01e76f686 Removed unmaintaned OScommerce module 2014-09-29 15:22:48 +02:00
Laurent Destailleur
8ccb581185 Fix: Change for php 5.6 
New: Management of color into type of events dictionnary (visible into
peruser view).
New: Can disable predefined type of events.
 2014-09-29 13:21:03 +02:00
Florian HENRY
7b0861842a changelog 2014-09-29 10:21:24 +02:00
Florian HENRY
ce145cc056 Add cache excel export on harddrive with 
MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR const. It can avoid lot's of stack
overflow on large excel export
 2014-09-29 10:16:48 +02:00
Florian HENRY
96c5771718 Fix web service category 2014-09-26 16:18:32 +02:00
fmarcet
7b9f154c29 Fix: Withdrawal total amount is double 2014-09-25 12:45:08 +02:00
fmarcet
63c6bd5d17 New: Added hook "formConfirm" and "doActions" for fichinter card 2014-09-24 13:28:59 +02:00
Florian HENRY
14ca936cfc set ref_supplier for contract field 2014-09-24 10:21:26 +02:00
Florian HENRY
518d23f278 Add feature to order to invoice on supplier part 2014-09-23 16:28:29 +02:00
Laurent Destailleur
4ff6b1ab1a Merge branch 'KreizIT-predefined' into develop 
Conflicts:
	ChangeLog
 2014-09-22 23:57:12 +02:00
aspangaro
4b4fe9811f Changelog 2014-09-21 20:43:06 +02:00
aspangaro
1592968709 Merge remote-tracking branch 'Upstream/develop' into develop 2014-09-20 06:42:31 +02:00
Juanjo Menent
e39373ed9a - Fix: [ bug #1593 ] Spanish Localtax IRPF not being calculated since 
3.6.0 in supplier invoices when adding a line
 2014-09-19 09:58:58 +02:00
Juanjo Menent
c87e28d5f9 - Fix: [ bug #1593 ] Spanish Localtax IRPF not being calculated since 
3.6.0 in supplier invoices when adding a line
 2014-09-19 09:57:35 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
aspangaro
b22aef3521 Qual: Renamed all files & links "liste.php" into "list.php" 2014-09-18 20:33:37 +02:00
Laurent Destailleur
e64e161a58 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-18 17:54:24 +02:00
Laurent Destailleur
13abff1ed7 Merge branch 'develop' of github.com:aspangaro/dolibarr into 
aspangaro-develop

Conflicts:
	ChangeLog
 2014-09-18 17:53:41 +02:00
Laurent Destailleur
2b69358c9c Merge pull request #1896 from FHenry/develop 
Add Dunning into accountancy report
 2014-09-18 17:48:40 +02:00
Juanjo Menent
90edd96646 Fix: Invoices payments may be older than invoices 2014-09-18 10:11:39 +02:00
Juanjo Menent
ab83e22a12 Fix: Invoices payments may be older than invoices 2014-09-18 09:57:13 +02:00
Laurent Destailleur
d976a5575b New: Add option MAIN_GENERATE_INVOICES_WITH_PICTURE to show picture onto 
PDF like MAIN_GENERATE_PROPOSALS_WITH_PICTURE dir for proposals.
 2014-09-17 14:36:04 +02:00
Laurent Destailleur
a834796181 New: Content of predefined email come firstly from table 
llx_c_email_template, then translation key.
 2014-09-17 01:12:59 +02:00
Florian HENRY
bb612d24db Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
	htdocs/compta/resultat/clientfourn.php
	htdocs/compta/resultat/index.php
 2014-09-16 21:09:53 +02:00
Florian HENRY
14ab058f34 Add Dunning into compta report 2014-09-16 21:05:57 +02:00
aspangaro
e1a40bd8bd Merge remote-tracking branch 'Upstream/develop' into develop-cheque 2014-09-16 07:23:55 +02:00
aspangaro
0f3db1e912 Add more search field in list of cheque deposits 2014-09-16 07:21:29 +02:00
Laurent Destailleur
83447243ae Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	build/debian/get-orig-source.sh
	htdocs/product/class/product.class.php
	htdocs/societe/soc.php
 2014-09-15 22:58:39 +02:00
Laurent Destailleur
05f3a47018 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	build/debian/control
	htdocs/compta/bank/account.php
	htdocs/fourn/paiement/fiche.php
	htdocs/product/class/product.class.php
	htdocs/product/fiche.php
 2014-09-15 22:52:59 +02:00
Laurent Destailleur
9c70c2c3d0 Fix: cents for indian ruppes are calle paisa and paise. 2014-09-15 22:43:49 +02:00
Laurent Destailleur
9ea3e33f94 Fix: Can edit status of event. 
New: Onto event summary of elements, end date and status are visible.
 2014-09-15 19:04:30 +02:00
Laurent Destailleur
0d6d064e7e New: PDF event report show project and status of event 
Fix: Can edit description of intervention
New: Show status of object on refere page.
 2014-09-15 12:48:24 +02:00
Laurent Destailleur
c4facf20e6 Merge branch 'bug-1546' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1546

Conflicts:
	ChangeLog
 2014-09-14 21:39:25 +02:00
Laurent Destailleur
822a3ebe7e Merge branch 'bug-1548' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1548

Conflicts:
	ChangeLog
 2014-09-14 21:37:15 +02:00
Laurent Destailleur
ef99de4e84 Merge branch 'bug-1555' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1555

Conflicts:
	ChangeLog
 2014-09-14 21:35:07 +02:00
Laurent Destailleur
2704f50bd4 Merge branch 'bug-1577' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1577

Conflicts:
	ChangeLog
 2014-09-14 21:31:51 +02:00
Laurent Destailleur
f0d4ebe417 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 
Conflicts:
	ChangeLog
 2014-09-14 21:26:56 +02:00
Marcos García de La Fuente
7bac9444e6 [ bug #1546 ] Incorrect page number when searching in the list of bank transactions 2014-09-14 14:32:17 +02:00
Marcos García de La Fuente
9426298b95 [ bug #1548 ] Supplier payment card shows type in French 2014-09-14 14:19:46 +02:00
Marcos García de La Fuente
7a28f8e4aa [ bug #1555 ] Update accountancy code of products does not throw PRODUCT_MODIFY trigger 2014-09-14 13:59:06 +02:00
Marcos García de La Fuente
afd631e6e3 [ bug #1577 ] When creating new Private individual third, selected third type is ignored 2014-09-14 13:22:05 +02:00
Marcos García de La Fuente
74e16db632 [ bug #1589 ] Menu type in "Edit menu" page is not translated 2014-09-14 13:14:03 +02:00
Marcos García de La Fuente
949ae2f160 [ bug #1591 ] Linked object block shows Total HT/TTC even if not having permission to read them 2014-09-14 13:09:31 +02:00
Laurent Destailleur
f264e25514 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/adherents/liste.php
	htdocs/compta/bank/bankid_fr.php
	htdocs/holiday/index.php
	htdocs/opensurvey/list.php
 2014-09-13 19:10:05 +02:00
Laurent Destailleur
8dd9358214 Fix: SQL injection 2014-09-13 19:04:25 +02:00
Laurent Destailleur
23eee1b83a New: Add hourly and daily amount on user card. Add weekly working hours 
and salary on user card.
 2014-09-13 17:41:26 +02:00
Laurent Destailleur
744f370920 Merge remote-tracking branch 'origin/3.6' into develop 2014-09-11 17:47:58 +02:00
Cedric
86d8870939 Add create button on predefined invoice details 
Check invoice creation right
 2014-09-11 17:33:47 +02:00
Laurent Destailleur
7851587a11 Merge pull request #1869 from FHenry/3.6 
Extrafield feature select from table should try to translate multiple column when not needed
 2014-09-11 17:13:28 +02:00
aspangaro
495a261bfd Add special thanks to developpers & contributors of module accounting. 2014-09-10 20:47:27 +02:00
Laurent Destailleur
342e26f679 Merge 2014-09-07 12:22:04 +02:00
Laurent Destailleur
789427b75d Upgrade phpexcel lib to 1.7.8 2014-09-07 12:12:30 +02:00
Laurent Destailleur
012643a892 New: Can filter on status on interventions. 2014-09-06 19:10:59 +02:00
Laurent Destailleur
cbaa7816bf New: add css style "cursorpointer". 
Start to work on clicable links into peruser agenda view.
 2014-09-06 00:32:54 +02:00
Laurent Destailleur
31eb4bda88 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/compta/facture.php
 2014-09-06 00:26:11 +02:00
aspangaro
b543f76ac9 Changelog 
Conflicts:
	ChangeLog
 2014-09-05 22:38:17 +02:00
aspangaro
f054d624cd Merge branch 'Upstream/3.6' 2014-09-05 20:59:44 +02:00
aspangaro
71832b5944 Changelog 2014-09-05 20:55:40 +02:00
Laurent Destailleur
a93ad958ac New: Add help info of field type into dictionary of payment types. 2014-09-05 09:33:12 +02:00
Florian HENRY
85cabbf921 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 
Conflicts:
	ChangeLog
 2014-09-04 18:29:17 +02:00
Laurent Destailleur
da8a1cb475 Fix: Iban was used instead of Bic into SEPA file. 
Fix: Must unaccent strings into SEPA file.
 2014-09-04 15:38:20 +02:00
Laurent Destailleur
b1b69336ae New: Add proposals into referer page of thirdparty 2014-09-03 18:48:42 +02:00
Florian HENRY
b04eae95e5 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-09-03 11:44:37 +02:00
Laurent Destailleur
257d7c41d6 Merge pull request #1863 from FHenry/3.6 
Fix: list event view lost type event filter
 2014-09-02 19:34:17 +02:00
Laurent Destailleur
adc96cc826 Merge pull request #1853 from aspangaro/develop-accounting 
Integration of module Accounting Expert
 2014-09-02 19:14:21 +02:00
Laurent Destailleur
38233ca05d Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/admin/limits.php
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/core/ajax/ziptown.php
 2014-09-02 13:46:47 +02:00
Laurent Destailleur
e82e26c6fa Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	ChangeLog
	htdocs/compta/facture.php
	htdocs/core/js/lib_head.js
 2014-09-02 12:57:33 +02:00
Florian HENRY
9b40cc9e89 fix 2014-09-02 12:09:43 +02:00
Florian HENRY
832d1b37c1 Save also code of event 2014-09-02 11:32:38 +02:00
Florian HENRY
911aca399d save code event 2014-09-02 11:30:35 +02:00
Florian HENRY
c8a9f4600c Fix: list event view lost type event filter 2014-09-02 11:20:57 +02:00
Florian HENRY
67b308cb25 Fix: list event view lost type event filter 2014-09-02 11:15:01 +02:00
Juanjo Menent
cc858b2af0 Fix SQL syntax 
ChangeLog
 2014-09-01 22:41:36 +02:00
Florian HENRY
e2fac5dd91 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 
Conflicts:
	ChangeLog
 2014-09-01 19:10:18 +02:00
Juanjo Menent
dc46d59d68 Fix: Unsubscribe emailing not working 2014-09-01 18:26:24 +02:00
Juanjo Menent
4372c58714 Fix: Unsubscribe emailing not working 2014-09-01 18:24:25 +02:00
Florian HENRY
db1c97bdad changelog 2014-09-01 11:52:20 +02:00
aspangaro
74ef9d5c59 Changelog 2014-08-30 06:22:18 +02:00
Juanjo Menent
328b8b9643 Fix: Salary payments are not reflected on the reporting sheets 
Conflicts:
	ChangeLog
 2014-08-28 15:29:31 +02:00
Juanjo Menent
0e1f22fe26 Fix: Salary payments are not reflected on the reporting sheets 2014-08-28 15:16:14 +02:00
Laurent Destailleur
4405f17f22 Update changelog 2014-08-26 23:47:44 +02:00
Laurent Destailleur
12c6752971 Fix: Can upload files on services. 2014-08-26 23:45:02 +02:00
Laurent Destailleur
b602b7098c Update changelog 2014-08-22 00:09:27 +02:00
Laurent Destailleur
e3fede595f Removed all triggers _BUILDOC. Building a document is not a business 
status change but a technical action. So hooks must be used instead.


Merge branch '3.6-patch' of github.com:aspangaro/dolibarr into
aspangaro-3.6-patch

Conflicts:
	htdocs/core/modules/project/modules_project.php
	htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
 2014-08-22 00:01:53 +02:00
Laurent Destailleur
2cba55758b Merge branch 'fix_1544' of github.com:KreizIT/dolibarr into 
KreizIT-fix_1544

Conflicts:
	ChangeLog
 2014-08-21 23:29:38 +02:00
aspangaro
0f7e09d01f Merge branch 'Upstream/develop' 2014-08-20 07:54:33 +02:00
Laurent Destailleur
a26a7cedf8 Qual: Uniformize code. Trigger PROJECT_BUILDDOC is removed because 
building a doc is not a business event. For technical action after
creation of a pdf, hook "afterPDFCreation" must be used instead.
 2014-08-19 14:51:10 +02:00
Laurent Destailleur
7437eb8088 New: On contact list can set filter on both active and not active (no 
more exclusive select).
 2014-08-19 14:40:20 +02:00
aspangaro
f774ff487b Merge branch 'Upstream/develop' 2014-08-18 11:56:49 +02:00
Laurent Destailleur
be6f99c10e Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/core/db/mysql.class.php
	htdocs/core/db/mysqli.class.php
	htdocs/core/lib/ajax.lib.php
 2014-08-17 19:34:12 +02:00
Laurent Destailleur
3f8ec47e91 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	ChangeLog
 2014-08-16 17:37:37 +02:00
Laurent Destailleur
3336b5bdce Fix: [ bug #1553 ] Saving User displays setup removes menu 2014-08-16 17:35:19 +02:00
Laurent Destailleur
f0c9513fa9 Fix: [ bug #1558 ] Product/service edit page title shows new Ref instead 
of old ref
 2014-08-16 17:18:53 +02:00
Laurent Destailleur
7edf2eacea New: Each user can include its own external ics calendar into dolibarr 
agenda view.
 2014-08-15 17:08:05 +02:00
Laurent Destailleur
96cb9fe6cb Merge remote-tracking branch 'origin/3.6' into develop 2014-08-15 02:35:06 +02:00
Laurent Destailleur
6b6b372579 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/theme/eldy/graph-color.php
 2014-08-15 02:28:16 +02:00
Cedric
8670a89ecb Fix #1544: Can remove date from invoice 2014-08-14 08:41:24 +02:00
Laurent Destailleur
80a68a8295 Update changelog 2014-08-14 01:05:37 +02:00
Laurent Destailleur
18b44ccfae Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into 
aspangaro-develop-favorite

Conflicts:
	htdocs/core/class/html.form.class.php
 2014-08-14 01:04:15 +02:00
Laurent Destailleur
69d23b3ea0 Merge branch 'task1218' of github.com:KreizIT/dolibarr into 
KreizIT-task1218

Conflicts:
	ChangeLog
 2014-08-14 00:24:08 +02:00
Laurent Destailleur
cc86e280f9 Merge branch 'task712' of github.com:KreizIT/dolibarr into 
KreizIT-task712

Conflicts:
	ChangeLog
 2014-08-14 00:18:51 +02:00
Florian HENRY
329c0b2913 Fix: Missing include files.lib.php in some pages ti use 
dol_delete_recursive
 2014-08-13 12:42:55 +02:00
Florian HENRY
bab7533578 Enable supplier price log table 2014-08-12 18:16:59 +02:00
Florian HENRY
db7478098a Add a real free numbering module for contract 2014-08-12 13:26:06 +02:00
aspangaro
1a87d98357 Qual: Renamed table llx_c_civilite into llx_c_civility 
field civilite into label in the same table and field civilite into civility in other table
 2014-08-12 06:03:27 +02:00
aspangaro
6fd77e7ef6 Merge branch 'Upstream/develop' 2014-08-11 13:26:58 +02:00
Laurent Destailleur
b713bd7b88 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-08-11 11:31:10 +02:00
Laurent Destailleur
d85f319a86 New: Select list of users can return user into hierarchy. 2014-08-11 11:29:47 +02:00
aspangaro
0738103da8 Renamed llx_c_pays to llx_c_country & field "libelle" to "label" 2014-08-10 13:37:39 +02:00
KreizIT
9bf32603fe [ task #1218 ] Can drag and drop an event from calendar to change its day. 2014-08-08 14:25:14 +02:00
Laurent Destailleur
4922071af9 New: When a translation is not available we always jump to en_US and 
only en_US.
 2014-08-08 10:50:37 +02:00
Laurent Destailleur
111d215ef1 Merge pull request #1807 from atm-maxime/develop 
New: Intervention documents are now available in ECM module
 2014-08-08 01:56:33 +02:00
Laurent Destailleur
2eea7cdc7f New: Intervention documents are now available in ECM module 2014-08-08 01:55:45 +02:00
Laurent Destailleur
42d992b009 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/lib/project.lib.php
	htdocs/fourn/facture/fiche.php
	htdocs/projet/class/project.class.php
 2014-08-08 01:26:53 +02:00
Laurent Destailleur
91aabbb40e Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/lib/project.lib.php
	htdocs/main.inc.php
 2014-08-08 01:19:03 +02:00
KreizIT
973d61fe13 [ task #712 ] Add warning when creating invoice from proposal or order, when there is already one invoice 2014-08-07 16:23:02 +02:00
Laurent Destailleur
055397a94b New: Can attach supplier order to a customer order. 2014-08-07 15:12:27 +02:00
Maxime Kohlhaas
3b14fa2b35 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2014-08-07 12:27:46 +02:00
Laurent Destailleur
d0c3a7913f Fix: visible task into area "time" for "My task" must limit task to 
tasks i am assigned to.
 2014-08-07 12:15:18 +02:00
Laurent Destailleur
35d2e4f84c Merge remote-tracking branch 'origin/3.6' into develop 2014-08-06 10:30:58 +02:00
Laurent Destailleur
230b1d4bb8 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	test/phpunit/SqlTest.php
 2014-08-06 10:28:37 +02:00
Laurent Destailleur
86c6709d02 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-08-06 10:10:13 +02:00
Maxime Kohlhaas
5e63f16d32 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 
Conflicts:
	ChangeLog
 2014-08-06 09:58:10 +02:00
Maxime Kohlhaas
3622b472dd Changelog 2014-08-06 09:57:20 +02:00
Laurent Destailleur
82921232f5 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/holiday/class/holiday.class.php
 2014-08-06 09:27:01 +02:00
Laurent Destailleur
c781bb4d08 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/holiday/fiche.php
 2014-08-06 09:12:29 +02:00
Laurent Destailleur
2d524f2edc Fix: Holiday module was broken. Initializaion of amount of holidays 
failed.
 2014-08-06 09:09:22 +02:00
Laurent Destailleur
1751b58ef8 New: Can add __PROJECT_REF__ and __TIHRPARTY_NAME__ into email topic or 
content template.
 2014-08-06 00:46:00 +02:00
Laurent Destailleur
e77be9e529 Merge remote-tracking branch 'origin/3.6' into develop 2014-08-06 00:15:14 +02:00
Laurent Destailleur
131c8398ce Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-06 00:13:48 +02:00
Laurent Destailleur
b182b2ff44 Update changelog 2014-08-06 00:11:42 +02:00
Maxime Kohlhaas
90c397d1a4 New: Intervention documents are now available in ECM module 2014-08-05 15:24:49 +02:00
Laurent Destailleur
c2be3364e0 Merge remote-tracking branch 'origin/3.6' into develop 2014-08-04 22:19:53 +02:00
Laurent Destailleur
76353bf427 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/compta/facture/impayees.php
	htdocs/core/lib/functions.lib.php
	htdocs/main.inc.php
 2014-08-04 22:18:30 +02:00
Laurent Destailleur
1f2cc71975 New: Supervisor is now visible into user list. 2014-08-03 11:36:00 +02:00
Laurent Destailleur
7c1af329f2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2014-08-01 22:26:17 +02:00
Florian HENRY
44f06bef22 Unpaid invoice launch fusion PDF action even if it is only search (with 
enter keyboard input instead of lens click)
 2014-08-01 15:21:29 +02:00
Florian HENRY
139dfa5b80 Fix : Fusion PDF button on unpaid invoice is no more displayed 2014-08-01 15:05:43 +02:00
Laurent Destailleur
600801a442 - New: First change to match accessibility rules: 
http://www.w3.org/TR/WCAG10-HTML-TECHS/
Differentiate text and img.
Use label into quick search form.
Use accesskey on form search.
 2014-07-29 22:04:53 +02:00
Laurent Destailleur
b57371bfa1 Fix: New: Differentiate text and img for better accessibility. 2014-07-29 20:21:01 +02:00
Laurent Destailleur
c895c892a5 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
 2014-07-29 01:17:00 +02:00
Laurent Destailleur
bf9313dd87 getBrowserInfo can return type of layout (classic/phone/tablet) 2014-07-27 20:56:26 +02:00
Laurent Destailleur
b964f9e9e3 New: Add info page about browser. 
Qual: Removed dedicated code to change top menu according to
dol_optimize_smallscreen. We must use instead size of screen into css.
 2014-07-27 14:13:25 +02:00
Laurent Destailleur
3d56c8ff6a Fix: [ bug #1537 ] Difference between societe.nom and adherent.societ 2014-07-26 18:20:40 +02:00
Laurent Destailleur
db091896a5 Prepare 3.6. 
Use google adsense tag of foundation for doxygen doc pages.

Version is no more encoded int odoxygen.

Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	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/compta/facture/impayees.php
	htdocs/filefunc.inc.php
 2014-07-26 18:10:51 +02:00
Laurent Destailleur
a8547e9c4d Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne 
s'appliquent pas
 2014-07-26 17:30:10 +02:00
Laurent Destailleur
5caa7ccd13 Merge pull request #1765 from marcosgdf/patch-3 
Added formConfirm and doAction for supplier invoice card
 2014-07-25 22:17:09 +02:00
Marcos García de La Fuente
280ecf1243 Merge remote-tracking branch 'upstream/3.6' into changelog 2014-07-23 06:25:21 +02:00
Marcos García de La Fuente
f31f0cc0a9 Updated changelog for 3.6 2014-07-23 06:25:12 +02:00
Marcos García de La Fuente
f3cbe1beac Task #1511 and updated changelog 2014-07-23 06:20:17 +02:00
Marcos García de La Fuente
4f582609f4 Added formConfirm and doAction for supplier invoice card 2014-07-22 04:24:08 +02:00
Juanjo Menent
acaca341ab Fix: [ bug #1521 ] The second order's page from a provider shows all 
orders

Conflicts:
	ChangeLog
 2014-07-21 17:00:59 +02:00
Juanjo Menent
8cd2e00e5f Fix: [ bug #1521 ] The second order's page from a provider shows all 
orders
 2014-07-21 16:57:08 +02:00
Laurent Destailleur
04a20d2008 - New: Enable feature developed for 3.6 we forgot to enabled: Adding 
prefix on uploaded file names. 
- New: No more dependency between contract and service module.
 2014-07-19 22:05:35 +02:00
Laurent Destailleur
92a5ebc459 - New: Home page of project area shows list of draft project (like other 
main page).
- New: Can search on project ref or string from project main page (like
other main page).
 2014-07-17 01:28:01 +02:00
Laurent Destailleur
8a8a90de78 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
 2014-07-15 23:30:15 +02:00
Laurent Destailleur
9acf60d7c5 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	.travis.yml
	ChangeLog
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/core/class/html.formfile.class.php
 2014-07-14 23:36:10 +02:00
Laurent Destailleur
f55814e3b2 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 
Conflicts:
	ChangeLog
 2014-07-14 23:11:33 +02:00
Juanjo Menent
ccf32636f8 Fix: Import ProfId1 to siren and ProfId2 to siret 
Conflicts:
	ChangeLog
 2014-07-14 19:43:59 +02:00
Juanjo Menent
3a8835892e Fix: Import ProfId1 to siren and ProfId2 to siret 
Conflicts:
	ChangeLog
 2014-07-14 19:42:54 +02:00
Juanjo Menent
3816e0fe14 Fix: Import ProfId1 to siren and ProfId2 to siret 2014-07-14 19:39:08 +02:00
Marcos García de La Fuente
4bc8e026b6 [ bug #1526 ] Thumbs of files uploaded with dots in their names do not load correctly 2014-07-13 19:51:44 +02:00
Florian HENRY
494e5b20a5 chnagelog 2014-07-12 10:17:04 +02:00
Florian HENRY
d0cc935cd5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-12 10:16:08 +02:00
KreizIT
b6edde320b Conflict solved 2014-07-12 09:20:00 +02:00
KreizIT
9c2aaf7d23 [ Task #1495 ] Add trigger LINECONTRACT_CREATE 2014-07-12 00:27:33 +02:00
KreizIT
ff19a87941 [Task #1481] Enable BILL_SUPPLIER_MODIFY trigger 2014-07-11 23:40:17 +02:00
juanjo
d27ec6306c Update ChangeLog: Remove add_photo_web() 2014-07-11 22:03:06 +02:00
juanjo
c1bfe0f6c5 Update ChangeLog: Remove add_photo_web() 2014-07-11 22:00:41 +02:00
Florian HENRY
d2e17eb321 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
 2014-07-11 16:09:01 +02:00
KreizIT
ca97c0bef3 Refactor: RESOURCE_* trigger 2014-07-11 16:06:06 +02:00
KreizIT
bbdaa59921 Refactor: ORDER_SUPPLIER_* and LINEORDER_SUPPLIER_* trigger 2014-07-11 15:32:23 +02:00
KreizIT
b8499a80ec Refactor: LINK_* trigger 2014-07-11 15:08:01 +02:00
KreizIT
fc61cc9bfa Refactor: BILL_* and LINEBILL_* trigger 2014-07-11 14:36:13 +02:00
Laurent Destailleur
4dfaf9ce38 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-11 13:56:57 +02:00
Laurent Destailleur
32b015e661 New: Type of thirdparties can accept a country (to show list of types 
specific for a country).
 2014-07-11 13:56:35 +02:00
Laurent Destailleur
5c81074483 Merge pull request #1709 from KreizIT/review_trig2 
Review trig2
 2014-07-11 12:27:43 +02:00
Florian HENRY
7d77772820 changelog 2014-07-11 11:45:59 +02:00
Florian HENRY
c7d31f4570 [ task #1204 ] Add ref_int contract field 2014-07-11 11:26:54 +02:00
Laurent Destailleur
682d765de9 New: Add country iso code on 3 chars into table of countries. 2014-07-09 00:16:28 +02:00
Laurent Destailleur
1a2ed2138b New: Add new type of event (when type of events are used, not by 
default)
 2014-07-06 21:25:25 +02:00
Laurent Destailleur
ce3fa14511 New: Add event FICHINTER_CLASSIFY_BILLED into list of possible events to 
create an automatic event into agenda.
Qual: Removed hard coded rowid into data init.
 2014-07-06 19:25:15 +02:00
Laurent Destailleur
823e976f39 Change the way parameters are provides to scripts 
sync_xxx_ldap2dolibarr.php
 2014-07-05 12:27:35 +02:00
KreizIT
c5bb55064f Fix: [ bug #1469 ] Triggers CONTACT_MODIFY and CONTACT_DELETE duplicates error message 2014-07-04 17:10:19 +02:00
KreizIT
e4ad082214 Fix: [ bug #1506, #1507 ] ECM trigger error problem 2014-07-04 16:39:54 +02:00
KreizIT
c70bdabeda Fix: [ bug #1501 ] DEPLACEMENT_CREATE trigger do not intercept trigger action 2014-07-04 16:23:10 +02:00
KreizIT
4666de85e2 Fix: [ bug #1508 ] STOCK_MOVEMENT does not show trigger error message 2014-07-04 16:18:54 +02:00
KreizIT
012fc4e8fe Fix: [ bug #1465, #1466 ] Product triggers problem 2014-07-04 15:54:20 +02:00
KreizIT
1ded34aa97 Fix: [ bug #1498, #1499 ] Shipment/Delivery triggers problem 2014-07-04 15:33:16 +02:00
KreizIT
fc6382ea7e Fix: [ bug #1463, #1464 ] Proposal triggers problem 2014-07-04 15:15:36 +02:00
Laurent Destailleur
42f33fc10e New: Add option PRODUCT_MAX_VISIBLE_PHOTO to limit number of photos 
shown on main product card.
 2014-07-04 15:14:14 +02:00
Laurent Destailleur
6144f90770 New: Form to add a photo is immediatly available on photo page if 
permissions are ok (save one click per photo to add).
 2014-07-04 15:06:45 +02:00
Laurent Destailleur
e496823778 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	.travis.yml
	ChangeLog
	htdocs/fourn/commande/fiche.php
	htdocs/install/mysql/migration/3.5.0-3.6.0.sql
	htdocs/product/stock/replenish.php
 2014-07-04 14:14:40 +02:00
Laurent Destailleur
7ee1388582 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-07-04 12:22:10 +02:00
KreizIT
e0201535e2 Fix: [ bug #1505, #1504] Project trigger problem 2014-07-03 17:15:42 +02:00
KreizIT
023e7ce8ce FIX : [ bug #1502 ] DON_CREATE trigger does not intercept trigger action 
- Add DON_CREATE in interface_90_all
- Add new trigger DON_UPDATE, DON_DELETE
 2014-07-03 16:04:12 +02:00
KreizIT
07f2d9474e FIX: [ bug #1494 ] CATEGORY_CREATE and CATEGORY_MODIFY triggers do not intercept trigger action 2014-07-03 15:52:37 +02:00
KreizIT
538cf90f5e FIX : [ bug #1496 ] ACTION_DELETE trigger does not show trigger error 
-Add ACTION_* trigger in interface_90_all
 2014-07-03 15:39:40 +02:00
KreizIT
f0323e5b80 FIX: Contract's trigger problem 2014-07-03 15:21:43 +02:00
KreizIT
685b7b23ad FIX: Member's trigger problem 2014-07-03 15:09:46 +02:00
KreizIT
174edb6140 FIX: Intervention trigger 2014-07-03 14:57:16 +02:00
KreizIT
7d30df42a2 ChangeLog modification 2014-07-03 14:15:15 +02:00
Laurent Destailleur
c1d33af50d - Fix: [ bug #1517 ] Packages sizes. 2014-07-02 20:11:08 +02:00
Laurent Destailleur
ea310efba5 Fix: [ bug #1471 ] Several PHP warnings when intercepting USER_CREATE 
trigger
 2014-07-02 19:57:18 +02:00
Laurent Destailleur
57b546650a Fix: Hide title of event when agenda module disabled. 2014-06-30 19:03:52 +02:00
Laurent Destailleur
e2472351c3 Merge branch 'fix1487' of github.com:KreizIT/dolibarr into 
KreizIT-fix1487

Conflicts:
	ChangeLog
 2014-06-29 23:42:38 +02:00
Laurent Destailleur
330c965cb9 New: Add hook "searchAgendaFrom". 2014-06-29 02:45:55 +02:00
Laurent Destailleur
6916d251b5 New: Can filter events on a group of users. 2014-06-28 20:49:10 +02:00
Laurent Destailleur
03c6d8fdc3 New: Can create proposal from an intervention. 2014-06-28 19:47:51 +02:00
Laurent Destailleur
2c493a4fe3 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
 2014-06-28 14:55:04 +02:00
Laurent Destailleur
71ee974ddb Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-06-28 14:53:28 +02:00
Laurent Destailleur
ef8b555750 Fix: When using option MAIN_MAIL_ALLOW_SENDMAIL_F, a mail was sent to 
sender.
 2014-06-28 14:48:00 +02:00
KreizIT
a153480bc6 Fix : [ bug #1487 ] PAYMENT_DELETE trigger does not intercept trigger action 
Change trigger call to new function call_trigger
 2014-06-27 13:48:23 +02:00
Juanjo Menent
6ce1ef08cf [ task #867 ] Remove ESAEB external module code from core 2014-06-27 09:09:08 +02:00
Laurent Destailleur
e2790895ad Prepare 3.7 development. 2014-06-26 21:48:57 +02:00
Laurent Destailleur
a2f610ffbe Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
 2014-06-26 21:41:45 +02:00
Laurent Destailleur
a79aa1f203 Merge branch 'develop' of github.com:FHenry/dolibarr into FHenry-develop 
Conflicts:
	htdocs/product/class/product.class.php
 2014-06-26 21:38:03 +02:00
Laurent Destailleur
abfe36620a Merge pull request #1686 from KreizIT/movetrig 
Fix [ bug #1459 ]
 2014-06-26 21:01:48 +02:00
Laurent Destailleur
fc4493242a Merge pull request #1685 from KreizIT/3.6 
FIX : #1477, #1478, #1479
 2014-06-26 21:00:26 +02:00
Laurent Destailleur
018e1d31e3 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/product/class/product.class.php
	htdocs/projet/class/project.class.php
 2014-06-25 20:22:25 +02:00
KreizIT
92f1778c9d Fix : [ bug #1459 ] _ADD_CONTACT and _DEL_CONTACT triggers do not intercept insertion when reported an error 
Start refactoring trigger call from within object
 2014-06-25 16:51:26 +02:00
Cedric
ee91f4a3f7 FIX : #1477, #1478, #1479 2014-06-25 13:37:55 +02:00
Cedric
e21e4dbf11 - FIX #1482 #1484 #1486 
- Add missing triggers in interface_90
 2014-06-24 11:49:53 +02:00
Cedric
00779dd8fa FIX #1460, #1461 2014-06-24 10:53:18 +02:00
Laurent Destailleur
04ead87aea Merge pull request #1681 from KreizIT/FIX1485 
FIX #1485:LINEBILL_SUPPLIER_DELETE failure trigger leads to an endless
 2014-06-23 20:20:31 +02:00
Cedric
7ced580abc Add fix to changelog 2014-06-23 12:35:37 +02:00
Laurent Destailleur
b4add020a9 Fix: Question about warehouse must not be done when module stock is 
disabled.
Fix: Option STOCK_SUPPORTS_SERVICES was not correctly implemented
(missing test at some places).
 2014-06-23 11:47:07 +02:00
Laurent Destailleur
d19b34cc7e Fix: Renaming a project with uplaoded files failed. 2014-06-21 15:45:53 +02:00
Laurent Destailleur
76532218c2 Fix: [ bug #1476 ] Invoice creation form loses invoice date when there 
is a validation error
 2014-06-21 15:35:30 +02:00
Laurent Destailleur
8d1fdec8cf Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/fiche.php
	htdocs/projet/fiche.php
 2014-06-20 15:26:02 +02:00
Laurent Destailleur
28fd8c6862 Fix: [ bug #1431 ] Reception and Send supplier order box has a weird top 
margin.
 2014-06-20 14:04:37 +02:00
Laurent Destailleur
a2065d0b6a Fix: [ bug #1428 ] "Nothing" is shown in the middle of the screen in a 
supplier order.
 2014-06-20 13:49:59 +02:00
Laurent Destailleur
fcb00b2024 Fix: [ bug #1425 ] 2014-06-20 13:38:44 +02:00
Laurent Destailleur
f7654107f9 Fix 1462, 1468, 1480, 1483, 1490, 1497 $this instead of $object 
Fix 1455 outstanding amount
 2014-06-20 13:22:08 +02:00
Laurent Destailleur
c903fe9340 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 
Conflicts:
	ChangeLog
 2014-06-20 13:20:07 +02:00
Laurent Destailleur
1cffc8d8f6 Merge branch '3.5' of github.com:fappels/dolibarr into fappels-3.5 2014-06-20 13:18:28 +02:00
Laurent Destailleur
6740e0321a Merge pull request #1670 from FHenry/3.5 
Fix [ bug #1349 ] AJAX contact selector does not work fine in Project
 2014-06-20 13:16:11 +02:00
Laurent Destailleur
8ce8bf47ee Fix: The object deliverycompany was not used anymore and output of 
details for delivery reports was lost during 3.5. Rewrite code to
restore feature.

Conflicts:
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
 2014-06-20 12:48:08 +02:00
Florian HENRY
40f5911f52 Fix: [ bug #1254 ] Error when using "Enter" on qty input box of a 
product (on supplier order part)
 2014-06-20 09:36:31 +02:00
Francis Appels
5b5473bc7c Fix: [ bug #1509 ] Expedition admin submit error 
Expedition admin free text & watermark submit error
 2014-06-19 10:02:58 +02:00
Florian HENRY
0645189432 If multiprice level is used the VAT on addline is not correct 2014-06-18 10:56:38 +02:00
Florian HENRY
9bb537f399 - New: If multilangue is enabled, mail (from propal, invoice, etc...) 
message is pre-defaulted in Customer language
 2014-06-18 09:59:15 +02:00
Florian HENRY
df9f153142 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.5.0-3.6.0.sql
 2014-06-17 12:01:45 +02:00
Florian HENRY
7f92031583 Changelog 2014-06-17 11:31:20 +02:00
Florian HENRY
0f77fbaea2 Fix [ bug #1349 ] AJAX contact selector does not work fine in Project 
card
 2014-06-17 11:18:30 +02:00
Laurent Destailleur
0c5c1cf849 Merge branch '3.5' of github.com:FHenry/dolibarr into 3.5 
Conflicts:
	ChangeLog
 2014-06-14 13:21:32 +02:00
Laurent Destailleur
0453daae72 Merge pull request #1656 from netfab/3.5 
html fix : missing </tr>.
 2014-06-14 12:34:06 +02:00
Laurent Destailleur
710497a081 Merge branch 'bug-1451' of github.com:marcosgdf/dolibarr into 3.5 
Conflicts:
	ChangeLog
 2014-06-14 12:32:59 +02:00
Laurent Destailleur
cf948065f4 Fixes for bug 1449, 1450 and 1451 #1654 2014-06-14 12:30:48 +02:00
Laurent Destailleur
c67dad0240 Merge branch 'bug-1432' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1432

Conflicts:
	ChangeLog
 2014-06-14 12:27:47 +02:00
Florian HENRY
0916d2cf3b Fix link element from project "associates object" pages 
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/50687-objet-associes-au-projet
 2014-06-13 15:54:37 +02:00
Florian HENRY
f796a6408e Do not display dictionnay for non activated module 2014-06-12 15:28:11 +02:00
Florian HENRY
80facefa23 Fix [ bug #1454 ] Mention de bas de page erroné 2014-06-12 09:13:51 +02:00
Laurent Destailleur
40742e84a9 Fix: Bad balance of colspan. 
Fix: Filter on status was not visible when selected from url.
Fix: Filtering on status was last when asking to sort.
 2014-06-11 16:47:00 +02:00
Fab
2fed26d68b html fix : missing </tr>. 2014-06-11 08:01:05 +02:00
Marcos García de La Fuente
ff37adf6f1 Fix: [ bug #1451 ] Interrupted order clone through trigger, loads nonexistent order 2014-06-10 13:47:30 +02:00
Marcos García de La Fuente
7cb5cc550f Didn't mean to change this entry of the changelog 2014-06-10 13:41:17 +02:00
Marcos García de La Fuente
b9801a8b3c Missing changelog 2014-06-10 13:32:47 +02:00
Marcos García de La Fuente
900b182f3c Updated changelog 2014-06-10 12:22:31 +02:00
Marcos García de La Fuente
0c1ba58a00 Fix: [ bug #1449 ] Trigger ORDER_CREATE ignores interception on error 2014-06-10 12:13:27 +02:00
Marcos García de La Fuente
e7cfb719b9 [ bug #1432 ] Trigger SHIPPING_CREATE ignores interception on error 2014-06-10 12:05:31 +02:00
Laurent Destailleur
47c982c506 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
 2014-06-10 08:45:08 +02:00
Laurent Destailleur
41adaeea99 Merge branch 'bug-1443' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1443

Conflicts:
	ChangeLog
 2014-06-10 01:42:39 +02:00
Laurent Destailleur
5853b9eb30 Merge branch 'bug-1416' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1416

Conflicts:
	ChangeLog
 2014-06-10 01:37:43 +02:00
Laurent Destailleur
9e91225936 Merge pull request #1648 from marcosgdf/bug-1415 
Fix: [ bug #1415 ] Intervention document model name and suppliers model names is not shown properly in module configuration
 2014-06-10 01:28:56 +02:00
Marcos García de La Fuente
85d906078a Fix: [ bug #1443 ] Payment conditions is erased after editing supplier invoice label or limit date for payment 2014-06-09 23:50:57 +02:00
Marcos García de La Fuente
0b73b44f34 Fix: [ bug #1416 ] Supplier order does not list document models in the select box of the supplier order card 2014-06-09 23:38:06 +02:00
Marcos García de La Fuente
83b58aca89 Typo 2014-06-09 22:49:27 +02:00
Marcos García de La Fuente
0810e6756a Fix: [ bug #1415 ] Intervention document model name and suppliers model names is not shown properly in module configuration 2014-06-09 22:48:16 +02:00
Laurent Destailleur
171227e43a Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2014-06-06 12:00:21 +02:00
Marcos García de La Fuente
4c11e37203 Fix: [ bug #1434 ] Muscadet supplier order document model linked objects overlap the text 2014-06-03 15:45:03 +02:00
Laurent Destailleur
fc2bd4ab4e Fix: [ bug #1380 ] Customer invoices are not grouped in company results 
report
(cherry picked from commit bd061f4)
 2014-06-02 02:16:49 +02:00
Laurent Destailleur
ccca46f380 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/list.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/functions.lib.php
	htdocs/expedition/note.php
	htdocs/fourn/commande/liste.php
	htdocs/fourn/facture/fiche.php
	htdocs/main.inc.php
	htdocs/projet/tasks/index.php
	htdocs/theme/eldy/style.css.php
 2014-05-29 19:20:48 +02:00
Laurent Destailleur
a63d085181 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-05-23 20:22:40 +02:00
Laurent Destailleur
07bc933110 Merge branch 'bug-1405' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1405

Conflicts:
	ChangeLog
 2014-05-23 20:21:41 +02:00
Laurent Destailleur
649fdd72dc Merge pull request #1622 from marcosgdf/bug-1410 
Fix: [ bug #1410 ] Add customer order line asks for required Unit Price but doesn't interrupt the creation of the line
 2014-05-23 20:20:22 +02:00
Laurent Destailleur
2771c506e9 Merge branch 'bug-1407' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1407

Conflicts:
	ChangeLog
 2014-05-23 20:17:41 +02:00
Laurent Destailleur
d1ee20dd42 Merge branch 'bug-1411' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1411

Conflicts:
	ChangeLog
 2014-05-23 20:11:13 +02:00
Laurent Destailleur
dc94b6e1bf Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-05-23 20:08:43 +02:00
Laurent Destailleur
9c398b14c5 Merge branch 'bug-1397' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1397

Conflicts:
	ChangeLog
 2014-05-23 20:06:40 +02:00
Marcos García de La Fuente
fa733c8ba4 Fix: [ bug #1405 ] Rouget PDF expedition incorrect when two expeditions under the same commande 2014-05-23 11:42:14 +02:00
Laurent Destailleur
2c05146778 Merge pull request #1621 from marcosgdf/bug-1388 
Fix: [ bug #1388 ] Wrong date when invoicing several orders
 2014-05-23 11:34:41 +02:00
Marcos García de La Fuente
a705d4e333 Fix: [ bug #1410 ] Add customer order line asks for required Unit Price but doesn't interrupt the creation of the line 2014-05-23 03:00:46 +02:00
Marcos García de La Fuente
0d121de1a6 Fix: [ bug #1388 ] Wrong date when invoicing several orders 2014-05-23 02:48:24 +02:00
Marcos García de La Fuente
77c09d887a Fix: [ bug #1407 ] Rouget pdf overlapped when using tracking number and public notes 2014-05-23 02:44:02 +02:00
Marcos García de La Fuente
b2f299f5e4 Fix: [ bug #1411 ] Unable to set an expedition note if invoices module is not enabled 2014-05-23 02:22:38 +02:00
Marcos García de La Fuente
603c28dcdd [ bug #1397 ] Filter by supplier orders with status Draft does not filter 2014-05-23 02:04:02 +02:00
Florian HENRY
2a16a562d9 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 
Conflicts:
	ChangeLog
 2014-05-22 12:51:55 +02:00
Florian HENRY
87b9d0412c Fix element page on project 2014-05-22 12:51:00 +02:00
Laurent Destailleur
94335b186e Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/modules/propale/mod_propale_marbre.php
 2014-05-21 20:30:07 +02:00
Laurent Destailleur
c82ff0a146 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 
Conflicts:
	ChangeLog
 2014-05-21 19:51:05 +02:00
Laurent Destailleur
4a89446162 Fix: When number reach 9999 with default numbering module, next number 
will be 10000 instead of 0000 and error.
 2014-05-21 19:47:41 +02:00
Florian HENRY
5a5c858578 [ bug #1399 ] [pgsql] Silent warning when setting a propal as 
"facturée" in propal.php
 2014-05-19 16:21:59 +02:00
Laurent Destailleur
b7f55ea99c Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/modAgenda.class.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/liste.php
 2014-05-18 11:52:52 +02:00
Marcos García de La Fuente
39b0ed7fc2 Fix: [ bug #1393 ] PHP Warning when creating a supplier invoice. 2014-05-14 22:47:19 +02:00
Laurent Destailleur
bd061f4245 Fix: [ bug #1380 ] Customer invoices are not grouped in company results 
report
 2014-05-13 01:29:01 +02:00
Laurent Destailleur
5f0c4dbe48 Fix: TCPDF error file not found in member card generation 2014-05-12 10:07:57 +02:00
Laurent Destailleur
6f4a390780 Fix: [ bug #1367 ] "Show invoice" link after a POS sell throws an error 2014-05-11 19:06:17 +02:00
Laurent Destailleur
bcfc9f8aa1 Fix: [ bug #1381 ] PHP Warning when listing stock transactions page 2014-05-11 18:06:30 +02:00
Laurent Destailleur
2bac66fd52 Merge remote-tracking branch 'origin/3.5' into develop 2014-05-10 19:53:06 +02:00
Laurent Destailleur
7bb24969d8 Fix: [ bug #1372 ] Margin calculation does not work in proposals 2014-05-10 19:52:24 +02:00
Laurent Destailleur
4e41b721fb Fix: Nb of notes and doc not visible onto tasks. 2014-05-10 16:43:47 +02:00
Laurent Destailleur
d76683a116 New: Add hooks on project card page. 2014-05-08 20:07:16 +02:00
Laurent Destailleur
7bfbc4cbf3 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/modules/modExpedition.class.php
	htdocs/projet/class/project.class.php
 2014-05-07 19:30:19 +02:00
Laurent Destailleur
40577ab445 New: Can enter holiday for someone else if user has permission for. 2014-05-07 15:03:05 +02:00
Marcos García de La Fuente
fb7f08b33a Corrected changelog message 2014-05-07 10:43:19 +02:00
Marcos García de La Fuente
7fe5389adf Updated changelog 2014-05-07 10:41:43 +02:00
Laurent Destailleur
a127f09377 - New: Paypal/paybox email sent after backcall of a payment is now a 
formated and translated HTML content. For member subscription
renewal, there is also a link to member.
- New: When a subscription is recorded with invoice and payment: the
document (PDF) of invoice is also generated and the invoice is set
to status paid.
 2014-05-07 10:33:10 +02:00
Laurent Destailleur
9f795331f5 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	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/paiement_charge.php
	htdocs/compta/sociales/charges.php
	htdocs/core/db/mysql.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/class/societe.class.php
 2014-05-06 23:58:17 +02:00
Laurent Destailleur
fe43d10c79 Fix: [ bug #1360 ] note indicator for member tab. 2014-05-06 23:42:19 +02:00
Laurent Destailleur
5a6ad1ef5f Fix: [ bug #1362 ] Note is not saved 
Fix: tr/td balance.
 2014-05-06 23:19:48 +02:00
Laurent Destailleur
460b5296ba Fix: [ bug #1353 ] Email notifications, wrong URL 2014-05-06 22:21:34 +02:00
Laurent Destailleur
215ff25ddd Fix: navigation on tab notes for shipment was not working. 2014-05-06 13:51:22 +02:00
Laurent Destailleur
4da918ce01 Update doc 2014-05-06 13:32:37 +02:00