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

43255 Commits

Author SHA1 Message Date
Laurent Destailleur
3db021addf Fix Use correct boolean type. 
Complete doxygen
 2015-08-26 11:24:31 +02:00
Juanjo Menent
9deaa3cceb Merge remote-tracking branch 'origin/3.8' into develop 2015-08-25 22:01:33 +02:00
Juanjo Menent
f32a7ba228 Close #3224 2015-08-25 21:59:46 +02:00
aspangaro
73d8f20c6b Fix: Correct directory where the donation is generated & add the action to remove_file who are generated 2015-08-25 08:09:14 +02:00
Laurent Destailleur
a54589c13c Fix filter lost 2015-08-24 17:47:26 +02:00
Laurent Destailleur
09355b0c7b Fix filtering 2015-08-24 16:40:43 +02:00
Laurent Destailleur
2cf10ac05d Fix filtering 2015-08-24 16:32:43 +02:00
Laurent Destailleur
8061ec9084 Fix translation 2015-08-24 15:59:17 +02:00
Laurent Destailleur
aaba18bd51 Fix filter on date 2015-08-24 15:40:33 +02:00
Laurent Destailleur
32ec57403b Bad translation 2015-08-24 15:28:15 +02:00
Laurent Destailleur
1a55159e35 Fix filter on prospect status 2015-08-24 14:59:46 +02:00
Laurent Destailleur
80fc4743c9 Fix the property "list" was not used. 2015-08-24 14:42:07 +02:00
Laurent Destailleur
feed3f714c Fix to avoid warning 2015-08-24 11:17:11 +02:00
aspangaro
478947d630 Correct 2015-08-23 07:46:37 +02:00
aspangaro
7d2eae2359 Fix: Better presentation for add form 2015-08-23 07:37:38 +02:00
BENKE Charlie
af7302fa90 change done 2015-08-23 00:30:11 +02:00
Regis Houssin
7b7fc44b46 Fix: disable hook for avoid errors when object langs is disable 2015-08-22 09:24:46 +02:00
BENKE Charlie
1b117d5581 add in get_origin function generic origintype 
actually we have only internal module origintype 
propose to add feature to add stockmovement from other external module
 2015-08-21 14:10:55 +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
da8e71b2c5 Fix #3309 2015-08-20 16:05:29 +02:00
Laurent Destailleur
1b409538a8 Fix #3400 
Conflicts:
	htdocs/core/lib/date.lib.php
 2015-08-20 15:51:28 +02:00
Laurent Destailleur
4541d189ac Fix #3400 2015-08-20 15:50:00 +02:00
Laurent Destailleur
18f064cc69 Fix login is a mandatory field. 2015-08-20 15:18:36 +02:00
Laurent Destailleur
d409568442 Format code 2015-08-20 15:07:16 +02:00
Laurent Destailleur
e24fd6fa37 Merge remote-tracking branch 'origin/develop' into 3.8 
Conflicts:
	htdocs/expedition/class/expedition.class.php
 2015-08-20 14:36:32 +02:00
Laurent Destailleur
c3fb14855b Try a better fix to replace PR #3297 2015-08-20 14:34:48 +02:00
Laurent Destailleur
d90b342cc9 Fix use dedicated escapment function 2015-08-20 14:34:08 +02:00
Laurent Destailleur
2266c2806f Merge pull request #3396 from fappels/3.8 
Fix shipment validation: 2 times qty in SQL select
 2015-08-20 14:32:34 +02:00
Laurent Destailleur
936f912216 Fix filter on category 2015-08-20 04:07:07 +02:00
Laurent Destailleur
26e3fcc636 Try a better fix to replace PR #3297 2015-08-20 03:38:21 +02:00
Laurent Destailleur
9a6e13d253 Fix test if empty was inverted 2015-08-19 19:45:24 +02:00
Laurent Destailleur
b11642a7f4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-08-19 18:27:22 +02:00
Laurent Destailleur
5f30ad3b63 Fix no link to show if id empty 2015-08-19 18:27:12 +02:00
philippe grand
3743c7460d FIX : pdf_writeLinkedObjects use foreach instead of for($i..) because 
now linked objects return by fetchLinkedObject are associative array
with ID as key.
 2015-08-19 16:36:44 +02:00
fappels
38584f2cfa Fix shipment validation 2 times qty in SQL select 2015-08-19 10:42:54 +02:00
Juanjo Menent
7befa78223 Merge pull request #3386 from grandoc/grandoc_fixes_20150815 
the form should be outside table to avoid errors
 2015-08-18 20:07:38 +02:00
Juanjo Menent
8ba1d1d414 Merge remote-tracking branch 'origin/3.8' into develop 2015-08-18 19:59:03 +02:00
fmarcet
d6b84233ed NEW: Translate extrafield's labels 2015-08-18 16:40:03 +02:00
Florian HENRY
8b62e562e5 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-08-18 11:14:22 +02:00
Laurent Destailleur
241bf85da2 Fix parameter sendmassremind 2015-08-18 09:53:04 +02:00
Laurent Destailleur
fabd751be4 Fix Server hang with long loop when reading specimen pdf and high number 
of tasks.
 2015-08-17 20:07:14 +02:00
Laurent Destailleur
76ce98630f Fix translation 2015-08-17 19:42:19 +02:00
Laurent Destailleur
7ff149e876 Fix missing param mode 2015-08-17 15:13:40 +02:00
Florian HENRY
b4e810a7a8 FIX: #3392 2015-08-17 13:05:54 +02:00
Laurent Destailleur
911f37b6eb Merge remote-tracking branch 'origin/develop' into 3.8 2015-08-17 12:55:41 +02:00
aspangaro
bd69d37c3a New: Add number of expense reports to pay 2015-08-17 05:29:12 +02:00
aspangaro
67140dc188 Fix: Missing "Gender" translation 2015-08-16 08:18:00 +02:00
Laurent Destailleur
2faa5d725e Missing tcpdf files 2015-08-15 18:17:54 +02:00
philippe grand
53a21019fd the form should be outside table to avoid errors 2015-08-15 16:15:54 +02:00
philippe grand
924ff21268 the form should be outside table to avoid errors 2015-08-15 16:12:33 +02:00
philippe grand
20a4304188 the form should be outside table to avoid errors 2015-08-15 16:10:24 +02:00
philippe grand
61f6da0210 the form should be outside table to avoid errors 2015-08-15 16:07:59 +02:00
philippe grand
670f0ae867 the form should be outside table to avoid errors 2015-08-15 16:03:09 +02:00
philippe grand
0432254412 the form should be outside table to avoid errors 2015-08-15 15:53:07 +02:00
philippe grand
b619aa080d the form should be outside table to avoid errors 2015-08-15 15:47:17 +02:00
philippe grand
676004e2e4 the form should be outside table to avoid errors 2015-08-15 15:42:54 +02:00
philippe grand
d51912687b the form should be outside table to avoid errors 2015-08-15 15:37:54 +02:00
philippe grand
a2b39721ce the form should be outside table to avoid errors 2015-08-15 15:35:31 +02:00
philippe grand
39c2c6b61b the form should be outside table to avoid errors 2015-08-15 15:30:12 +02:00
philippe grand
d596f5222b the form should be outside table to avoid errors 2015-08-15 15:08:11 +02:00
philippe grand
ece6d1bf02 the form should be outside table to avoid errors 2015-08-15 11:21:50 +02:00
Laurent Destailleur
f3c4e20db2 Fix centering of message on logon page 2015-08-15 03:41:57 +02:00
Laurent Destailleur
52240eec9a Fix removed warnings 2015-08-15 02:44:05 +02:00
Laurent Destailleur
d9b3069813 Fix: When validation and approval where done in same step, label of 
action used always label for validation.
 2015-08-15 02:34:15 +02:00
Laurent Destailleur
3bdd342df1 Fix #3116 2015-08-14 23:53:59 +02:00
Laurent Destailleur
d408193657 Fix: When stock is empty, no information was visible to explain why 
create button does not work.
 2015-08-14 20:37:20 +02:00
Laurent Destailleur
10d3c41358 Fix Bad value into popup 2015-08-14 20:07:11 +02:00
Laurent Destailleur
5ed3d80103 Merge pull request #3385 from marcosgdf/bug-3321 
FIX [ bug #3321 ] Users with certain permissions were shown a "forbidden access" page even if they had the rights
 2015-08-14 18:10:28 +02:00
Laurent Destailleur
cacfe454a9 Merge pull request #3382 from hregis/3.7_bug 
Fix: place the form outside the table for avoid errors
 2015-08-14 18:09:57 +02:00
Laurent Destailleur
6c01403ef3 Merge branch 'resources-fixes' of https://github.com/IonAgorria/dolibarr 
into IonAgorria-resources-fixes

Conflicts:
	htdocs/core/tpl/resource_add.tpl.php
	htdocs/resource/element_resource.php
 2015-08-14 17:53:52 +02:00
Laurent Destailleur
2abb90713e Fix list of resource not visible 2015-08-14 17:35:05 +02:00
Laurent Destailleur
58988d3084 3.5.8 2015-08-14 16:12:36 +02:00
Laurent Destailleur
cfc7658399 Merge pull request #3380 from FHenry/3.8 
FIX : Fix demo dump data, date '0000-00-00 00:00:00' is not valid, replace by NOW()
 2015-08-14 15:52:57 +02:00
Laurent Destailleur
84d4cbdbcc Merge remote-tracking branch 'origin/3.7' into develop 2015-08-14 15:14:33 +02:00
Laurent Destailleur
343f4086bc Remove dead code 2015-08-14 15:12:40 +02:00
Laurent Destailleur
d13b8b8284 Fix better translation 2015-08-14 13:04:35 +02:00
Laurent Destailleur
1731b1a11b Fix: transparency of event was lost 2015-08-14 13:01:20 +02:00
Laurent Destailleur
d19f1722a2 Fix: when there is several events on agenda view per user, we must 
include ref into label to have different titles.
 2015-08-14 12:31:09 +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
Regis Houssin
fdf6c32fbc Fix: place the form outside the table for avoid errors 2015-08-13 12:47:04 +02:00
Florian HENRY
a916b75ad8 FIX : Better const usage in accountancy module 2015-08-13 11:32:31 +02:00
Florian HENRY
2775250ce4 Fix TYPE_SITUATION on sell journals 2015-08-13 11:23:27 +02:00
Florian HENRY
6806e2b36b FIX : Accountancy expert module filter on column must not launch ventil 
ventil
 2015-08-13 10:27:35 +02:00
Laurent Destailleur
d5ed875427 Fix no need the star for this case 2015-08-13 05:23:25 +02:00
Laurent Destailleur
3938a35455 Update template 2015-08-13 05:15:42 +02:00
Laurent Destailleur
0226f53098 Fix When selecting another email template, the topic was not replaced. 2015-08-13 05:09:26 +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
04812bf422 Fix date not visible and label of edit button not correct 2015-08-13 03:38:23 +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
418a609b73 Fix PHPCS 2015-08-13 03:06:25 +02:00
Laurent Destailleur
4a6239f9a7 Fix no default value for dangerous actions 2015-08-13 02:52:58 +02:00
Laurent Destailleur
460a78e3e5 Fix translation 2015-08-13 02:13:34 +02:00
Laurent Destailleur
74bf751ca1 Fix: Missing dol_fiche_head and end 2015-08-13 01:33:04 +02:00
Laurent Destailleur
811169b2ae Fix: do not show desc if empty 2015-08-13 01:26:25 +02:00
Laurent Destailleur
8122ed9ec3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-08-13 00:51:49 +02:00
Laurent Destailleur
ba67cf9fa6 Update doc 2015-08-13 00:51:32 +02:00
Laurent Destailleur
af2d63d7e5 Merge pull request #3368 from marcosgdf/bug-3211 
FIX [ bug #3211 ] Error about sold to pay (Montant encours)
 2015-08-13 00:15:13 +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
Laurent Destailleur
4a124c6ee9 Merge pull request #3350 from tomours/develop 
FIX #3349 Checking a VAT number with spaces
 2015-08-12 23:51:37 +02:00
Laurent Destailleur
958321b64d Merge pull request #3340 from atm-maxime/3.6 
Rowid was missing on expedition line so no origin id when creating an invoice
 2015-08-12 23:39:43 +02:00
Laurent Destailleur
16ee7b461c Merge pull request #3332 from atm-gauthier/3.7_fix_display_country_name_on_vcard 
FIX : Display country name instead of country id (display country id …
 2015-08-12 23:38:36 +02:00
Laurent Destailleur
923203802c fix dangerous sql injection #3327 2015-08-12 23:33:09 +02:00
Laurent Destailleur
25e729cf4d Revert "Fix #3322 Use title for alt if no alt is provided" 
This reverts commit 2cf9d9f583.
 2015-08-12 23:18:07 +02:00
Laurent Destailleur
2c791e528d Revert "unit price not used if qty = 1" 
This reverts commit fb25f479f2.
 2015-08-12 23:15:32 +02:00
Laurent Destailleur
f1e87478ff Fix translation of printing menu 2015-08-12 23:12:15 +02:00
Laurent Destailleur
f5c2378d91 Fix CSS 2015-08-12 22:38:40 +02:00
Laurent Destailleur
d4aabf99db Fix permission of module 2015-08-12 22:32:29 +02:00
Laurent Destailleur
b5730a24bc Fix W3C 2015-08-12 22:28:30 +02:00
Laurent Destailleur
fc9dc100b1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-08-12 22:13:19 +02:00
Laurent Destailleur
daeada4bae Merge branch 'patch-70' of https://github.com/defrance/dolibarr into 
defrance-patch-70

Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-08-12 22:12:50 +02:00
Ion Agorria
2e1e9017c6 Missed the file 2015-08-12 22:00:51 +02:00
Ion Agorria
f3cd9da73d Resource fixes 2015-08-12 21:48:00 +02:00
Juanjo Menent
f98c61fc06 Merge pull request #3376 from FHenry/develop_darkjeff 
NEW :  fix some feature on accountancy modules (devellop)
 2015-08-12 18:46:34 +02:00
Juanjo Menent
78d1dfae11 Merge remote-tracking branch 'origin/3.7' into develop 2015-08-12 18:41:44 +02:00
Juanjo Menent
e4a9ca8b45 Merge pull request #3373 from hregis/3.7_bug 
Fix: missing entity in cache files names
 2015-08-12 18:38:39 +02:00
Juanjo Menent
993037ec9e Merge pull request #3371 from atm-gauthier/new_add_event_type_on_third_party_card_agenda_tab 
NEW : print event type on third party card tab agenda list (only if A…
 2015-08-12 18:25:20 +02:00
Florian HENRY
17146fdef7 fix stuff 2015-08-12 16:11:00 +02:00
Florian HENRY
adccd5d04f fix some feature on accountancy modules 2015-08-12 15:53:17 +02:00
Florian HENRY
f2c59405d4 Merge branch 'develop' into develop_darkjeff 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
 2015-08-12 14:23:51 +02:00
josemariagomezroncero
e146af3118 Update llx_c_type_resource.sql 
Error create table, missing incremet type element
 2015-08-11 22:38:21 +02:00
Francis Appels
1d85529eda Fix delete not used empty stock record 
When removing all stock from warehouse are move all stock to other
warehouse, there is still an 0 stock record in in the stock table for
the source warehouse, not visible in Dolibarr.
 2015-08-11 22:01:26 +02:00
Regis Houssin
ebe4969723 Fix: missing entity in cache files names 2015-08-11 10:22:06 +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
6964f80d8f Merge remote-tracking branch 'origin/3.8' into develop 2015-08-10 21:06:27 +02:00
Juanjo Menent
95e8148f78 Merge pull request #3294 from GPCsolutions/totalvalidator 
Totalvalidator
 2015-08-10 20:56:31 +02:00
Juanjo Menent
a6d7977d4f Merge pull request #3354 from defrance/patch-74 
New pdf for project - listing of elements
 2015-08-10 20:51:58 +02:00
Juanjo Menent
f3517871a9 Merge pull request #3357 from atm-maxime/new_stats_percent 
New : % of evolution on stats
 2015-08-10 20:51:08 +02:00
Juanjo Menent
d39b6a6bfa Merge remote-tracking branch 'origin/3.8' into develop 2015-08-10 20:46:35 +02:00
Juanjo Menent
e1f627ca8e Merge remote-tracking branch 'origin/3.7' into 3.8 2015-08-10 20:37:44 +02:00
Juanjo Menent
7d18adebb1 Merge pull request #3369 from marcosgdf/minor 
Fixed minor problem with error alert when creating user
 2015-08-10 20:35:03 +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
tomours
9267fe367e FIX #3372 - Printing issue with Postgres and dates (SQL format) 
After connecting to the database, we force datestyle to "ISO, YMD", so dates returned by the db will have a format compatible with Dolibarr functions.
This will fix dates printing issues in mostly all pages, with a postgres db configured with "SQL, DMY" as default.
 2015-08-10 15:10:58 +02:00
tomours
ef5d394b84 FIX #3349 Allow checking a VAT number with spaces 
One of the first things I did, while starting to try Dolibarr, was to fill info about my company.
I filled my VAT number : "FR 13 794..." and saw the "check" button.
Oh, that's nice ! Click. Didn't work :(
In fact, it didn't work because the webservice Dolibarr uses to check VAT numbers doesn't understand spaces.

By doing this we could enter good looking VAT numbers (with spaces) and still check them.
 2015-08-10 15:10:47 +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
3823744e8e Merge remote-tracking branch 'origin/3.8' into develop 2015-08-10 11:32:55 +02:00
Juanjo Menent
ae25846e25 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-08-10 11:31:38 +02:00
Juanjo Menent
5f70e94905 Merge pull request #3360 from marcosgdf/bug-3286 
Fix [ bug #3286 ]: Payment types are not translated to English
 2015-08-10 11:25:20 +02:00
Juanjo Menent
63d77b2ddd Merge remote-tracking branch 'origin/3.8' into develop 2015-08-10 11:11:43 +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
Darkjeff
2500e26072 update product account 
clean sql if buy or sell
 2015-08-10 10:29:05 +02:00
Marcos García de La Fuente
8a1c5450c2 Fixed minor problem with error alert when creating user 2015-08-09 18:26:12 +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
e725d44565 Fix [ bug #3286 ]: Payment types are not translated to English 
Close #3286
 2015-08-09 13:24:23 +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
a11962454f Best way to change ref and ref_supplier 2015-08-07 18:18:07 +02:00
Juanjo Menent
28a1612b8d Merge remote-tracking branch 'origin/3.8' into develop 2015-08-07 18:05:09 +02:00
Juanjo Menent
fd6f7dfa61 Fix #3355 2015-08-07 18:01:13 +02:00
Juanjo Menent
841cc0fe5e Fix #3355 2015-08-07 17:52:21 +02:00
Juanjo Menent
0d1b4e6911 Update fr_FR and es_ES printing message. Transifex works only for develop branch... 2015-08-07 17:09:36 +02:00
Maxime Kohlhaas
1cbb20c89f Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_stats_percent 2015-08-07 13:30:12 +02:00
Maxime Kohlhaas
0afd27e3c2 New : % of evolution on stats 2015-08-07 13:29:11 +02:00
Juanjo Menent
f695b5cd11 Merge remote-tracking branch 'origin/3.8' into develop 2015-08-07 13:01:53 +02:00
Juanjo Menent
38afb1a4e6 Merge remote-tracking branch 'origin/3.7' into 3.8 
# Conflicts:
#	htdocs/core/modules/modBarcode.class.php
 2015-08-07 12:57:16 +02:00
Juanjo Menent
12b83fd3e8 Fix #3304 2015-08-07 12:45:27 +02:00
Juanjo Menent
af55c8467b Merge remote-tracking branch 'origin/3.8' into develop 
# Conflicts:
#	htdocs/printing/admin/printing.php
 2015-08-07 10:14:30 +02:00
Juanjo Menent
ef6b96b4c7 Fix #3236 2015-08-07 10:12:10 +02:00
Juanjo Menent
9f2b4c503e Fix #3236 2015-08-07 09:57:43 +02:00
Juanjo Menent
9610a493c9 Merge remote-tracking branch 'origin/3.8' into develop 2015-08-07 09:29:36 +02:00
Juanjo Menent
5177c5f227 fix #3338 broken links on shippment card 2015-08-07 09:27:46 +02:00
BENKE Charlie
01671d02d1 New pdf for project - listing of elements 2015-08-07 00:39:44 +02:00
Juanjo Menent
1fdf4b69f8 Merge remote-tracking branch 'origin/3.8' into develop 2015-08-06 22:14:45 +02:00
Juanjo Menent
eb33624b99 Merge pull request #3291 from GPCsolutions/hookslogging 
NEW: log hooks loading
 2015-08-06 22:11:40 +02:00
Darkjeff
b185cfb85f Update product account 
choose between code sell or code buy
cleaning code
need some tests
 2015-08-06 21:23:02 +02:00
Juanjo Menent
c759a9662a Merge pull request #3345 from defrance/patch-72 
unit price not used if qty = 1
 2015-08-06 18:38:11 +02:00
Juanjo Menent
b91edcc9d7 Merge remote-tracking branch 'origin/3.8' into develop 2015-08-06 18:30:13 +02:00
Juanjo Menent
761c50a885 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-08-06 18:22:29 +02:00
Juanjo Menent
63f62a1fa2 Merge pull request #3344 from fmarcet/3.7 
FIX: Not showing task extrafields when creating from left menu
 2015-08-06 18:15:30 +02:00
Juanjo Menent
46a9381f0b Merge pull request #3335 from GPCsolutions/3.7-3322 
Fix #3322 Use title for alt if no alt is provided
 2015-08-06 18:12:25 +02:00
Juanjo Menent
d65d501750 Merge remote-tracking branch 'origin/3.8' into develop 2015-08-06 18:04:42 +02:00
Juanjo Menent
0e49f80035 Merge pull request #3333 from fmarcet/3.8 
FIX: Missing interventions headers
 2015-08-06 18:03:35 +02:00
Juanjo Menent
98072ec73e Merge remote-tracking branch 'origin/3.8' into develop 2015-08-06 18:00:59 +02:00
Maxime Kohlhaas
e13515e59f Merge branch '3.6' of github.com:Dolibarr/dolibarr into 3.6 2015-08-06 08:57:52 +02:00
BENKE Charlie
83c4652a16 don't display ref_fourn if it's same as ref 
decrease size of the select list
 2015-08-04 15:22:36 +02:00
BENKE Charlie
fb25f479f2 unit price not used if qty = 1 
this line is too long for add unused information
 2015-08-04 13:39:01 +02:00
fmarcet
62ad7d4d34 FIX: Not showing task extrafields when creating from left menu 2015-08-04 13:32:44 +02:00
Florian HENRY
2a7f5da4a7 FIX : export SQL instruction on modProduct with extrafields 2015-08-04 11:49:26 +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
Florian HENRY
d6776e1155 FIX : Error management in societe/soc.php 2015-08-03 11:39:24 +02:00
Raphaël Doursenaud
2cf9d9f583 Fix #3322 Use title for alt if no alt is provided 
alt has priority over title, so it should be filled if title is filled.
Use the title value to fill alt.
Unit test updated accordingly.
 2015-08-03 10:30:10 +02:00
Juanjo Menent
1dac1932a9 Merge remote-tracking branch 'origin/3.8' into develop 2015-08-01 15:44:16 +02:00
Juanjo Menent
e45d19862a Fix merge menu regresion 2015-08-01 15:43:14 +02:00
Juanjo Menent
9ae31f3a08 Merge remote-tracking branch 'origin/3.8' into develop 2015-08-01 15:01:19 +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
Juanjo Menent
2a67bd1f38 Fix #3314 Display state in bank account card 2015-08-01 14:43:04 +02:00
Juanjo Menent
22b4bfd1a4 Merge pull request #3334 from GPCsolutions/3.6-3314 
Fix #3314 Display state in bank account card
 2015-08-01 14:40:42 +02:00
Juanjo Menent
34b1ce618f Merge remote-tracking branch 'origin/3.8' into develop 2015-08-01 14:32:43 +02:00
Juanjo Menent
3d847ac894 Fix #3217 [Stocks] Warehouse list shows SQL request 2015-08-01 14:29:32 +02:00
Maxime Kohlhaas
9e05cecc1a Fix : rowid was missing on expedition line so no origin id when creating an invoice 2015-07-31 16:31:12 +02:00
Laurent Destailleur
f9a7a49e78 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-31 11:06:54 +02:00
Laurent Destailleur
9569431f44 Fix ident 2015-07-31 11:06:25 +02:00
Laurent Destailleur
4567f56980 Sync from transifex 2015-07-30 17:09:18 +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
0c6cb1c444 Fix bad translation 2015-07-30 14:47:56 +02:00
Laurent Destailleur
84e45848c8 Doc comments 2015-07-30 14:44:05 +02:00
Raphaël Doursenaud
3b9c8a685b Fix #3314 Display state in bank account card 2015-07-29 19:29:18 +02:00
Laurent Destailleur
cbb2d8d800 Fix typo 2015-07-29 16:30:30 +02:00
Laurent Destailleur
459f9e3db8 Fix avoid warning 2015-07-29 15:54:49 +02:00
Laurent Destailleur
ffeaa4e224 Test update checksum file 2015-07-29 15:50:59 +02:00
Laurent Destailleur
fcc6ce8c31 Fix Option for second level approbation was visible when it should 
not.
 2015-07-29 15:39:34 +02:00
Laurent Destailleur
c058437879 Fix missing translation 2015-07-29 14:50:53 +02:00
Laurent Destailleur
52b433a3f1 Comment 2015-07-29 13:11:23 +02:00
fmarcet
bd46f87ed8 FIX: Missing interventions headers 2015-07-29 13:04:12 +02:00
Laurent Destailleur
a6bac40f0a Fix bad translation 2015-07-29 13:03:52 +02:00
Laurent Destailleur
36a1fa6fbe Fix missing backtopage param 2015-07-29 12:38:02 +02:00
Laurent Destailleur
c2d2e06202 Fix bad glossary 2015-07-29 12:33:16 +02:00
Gauthier
cc8eac67d9 FIX : Display country name instead of country id (display country id makes no sense on vcard files) 2015-07-29 12:29:33 +02:00
Laurent Destailleur
068d235682 Fix missing $db into constructor 2015-07-29 12:10:04 +02:00
Laurent Destailleur
5cea60cf58 Default price for margin was not set 2015-07-28 19:39:42 +02:00
Darkjeff
977b12fac0 clean code customer and supplier accountancy 
celan code add VAT research
 2015-07-28 19:26:46 +02:00
Laurent Destailleur
a753755d75 Missing translation key 2015-07-28 19:06:49 +02:00
Laurent Destailleur
a73541194c Merge remote-tracking branch 'origin/develop' into 3.8 2015-07-28 18:57:42 +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
Laurent Destailleur
cc49b39eb6 Merge pull request #3329 from atm-gauthier/3.7_fix_add_user_on_event_in_create_mode 
FIX : When we add an user on event in create mode, we lose linked object
 2015-07-28 18:37:19 +02:00
Laurent Destailleur
c2eb47f3a1 Merge pull request #3325 from atm-ph/3.6_fix_timespent_id 
FIX no projet_task_time id from trigger TASK_TIMESPENT_CREATE
 2015-07-28 18:36:48 +02:00
Laurent Destailleur
bd4a31c45d Merge pull request #3320 from fmarcet/3.7 
Fix: Not showing delivery date on rouget pdf (expedition)
 2015-07-28 18:34:19 +02:00
Laurent Destailleur
fff86c0769 Fix PHPCS 2015-07-28 18:33:43 +02:00
Laurent Destailleur
a8d2aab291 Merge pull request #3315 from mrsof/patch-1 
FIX : Move "<script>" code inside "body"
 2015-07-28 18:32:11 +02:00
Laurent Destailleur
c42e952ce9 Merge pull request #3319 from FHenry/3.7 
FIX : #3318
 2015-07-28 18:30:19 +02:00
Laurent Destailleur
a3b379476b Merge pull request #3308 from atm-gauthier/3.7_fix_display_extraf_text_line_break 
FIX : Line break display as a block
 2015-07-28 18:19:07 +02:00
Laurent Destailleur
bdd9a6e59e Fix bad position of translation key 2015-07-28 18:14:15 +02:00
Laurent Destailleur
747e4b5e40 Fix timezone problem with external calendar import. 2015-07-28 18:12:45 +02:00
Gauthier
aaa9d85d07 FIX : When we add an user on event in create mode, we lose linked object 2015-07-28 17:25:33 +02:00
Gauthier
556d01ff8a FIX : Line break display as a block 2015-07-28 15:14:54 +02:00
Laurent Destailleur
5ca6593a57 Fix serious deadlock feature. It was possible to link with no way to 
unlink. What if user make a bad click ? I complete feature with
reverse action to be sure to not have users with a corrupted situation.
 2015-07-28 14:13:16 +02:00
Laurent Destailleur
72e7558356 Fix bad closing td 
Fix missing value into list of time spent
Fix typo error into constant PROJECT_TIMES_SPENT_FORMAT
Fix sql error when updating time spent into updateTimeSpent
Fix supplier orders not visible into link to
 2015-07-28 12:49:29 +02:00
Laurent Destailleur
9451296f6b Fix: Missing tooltip 2015-07-28 12:11:39 +02:00
Laurent Destailleur
a16d6b037c Fix: bad link to task 2015-07-28 12:06:57 +02:00
Laurent Destailleur
17f7b1528a Fix not compatible not supported option 2015-07-28 10:05:48 +02:00
Florian HENRY
517e9094da FIX : Avoid warning strict mode when hosting server do not have 
php5_curl installed
 2015-07-27 22:34:30 +02:00
Florian HENRY
d78292b9af FIX : if multicompany enabled, call to undifend method _setCookie 
instead of setCookie
 2015-07-27 22:08:33 +02:00
Laurent Destailleur
7e7d39f068 Merge remote-tracking branch 'origin/3.8' into develop 2015-07-27 20:22:51 +02:00
phf
824da6d2b0 FIX no projet_task_time id from trigger TASK_TIMESPENT_CREATE 2015-07-27 17:38:27 +02:00
Laurent Destailleur
f9fe623522 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-27 17:09:27 +02:00
Laurent Destailleur
d128cf69d9 Doxygen doc 2015-07-27 17:09:16 +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
Florian HENRY
c0412acdea FIX : #3318 2015-07-27 13:03:47 +02:00
Raphaël Doursenaud
eecc0c14b3 Qual: prefer title to summary for tables 
Summary is being deprecated in HTML5
 2015-07-24 11:41:22 +02:00
Raphaël Doursenaud
fea3957734 Qual: use CSS centering 2015-07-24 11:41:22 +02:00
Raphaël Doursenaud
95ca9cef75 Qual: use CSS vertical alignment 2015-07-24 11:41:22 +02:00
Raphaël Doursenaud
f63f66d681 Qual: prefer CSS centering 2015-07-24 11:41:22 +02:00
Raphaël Doursenaud
bd937070d2 Accessibility: added login form hidden labels 2015-07-24 11:41:22 +02:00
Raphaël Doursenaud
7398104f33 Qual: Ignore logo by assistive technology. 
http://www.w3.org/TR/WCAG20-TECHS/H67.html
 2015-07-24 11:40:24 +02:00
Sof
e455ed14ef FIX : Move "<script>" code inside "body" 2015-07-24 11:27:40 +02:00
Laurent Destailleur
96f1c25a73 Merge pull request #3287 from marcosgdf/bug-3198 
Fix: [ bug #3198 ] Trigger LINECONTRACT_INSERT passes Contrat as $object instead of ContratLigne
 2015-07-23 22:51:17 +02:00
Laurent Destailleur
e6f5450265 Merge pull request #3299 from FHenry/3.8_jquery 
NEW : upgrade jQuery Component Datable (and extras) to 1.10.7
 2015-07-23 22:48:10 +02:00
Laurent Destailleur
215d62f48d Merge pull request #3295 from FHenry/3.8 
FIX : #3305
 2015-07-23 22:08:08 +02:00
Laurent Destailleur
9ba9db9abe Merge pull request #3303 from All-3kcis/develop-patch-5 
Correct api_key and error "DB_ERROR_RECORD_ALREADY_EXISTS"
 2015-07-23 22:07:15 +02:00
Laurent Destailleur
ad43ef6112 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-22 23:34:07 +02:00
Laurent Destailleur
f52b5a240a Show sql query when log level is lower than LOG_DEBUG 2015-07-22 23:33:48 +02:00
Juanjo Menent
bd48163427 Merge remote-tracking branch 'origin/3.8' into develop 2015-07-22 11:27:05 +02:00
Juanjo Menent
16ae9633e5 FIX: Change Spanish provinces code to ISO 2015-07-22 11:26:20 +02:00
Juanjo Menent
70f9aa9ece Merge remote-tracking branch 'origin/3.8' into develop 2015-07-22 11:08:22 +02:00
Juanjo Menent
7c8b1feaeb FIX: Change Spanish provinces code to ISO 2015-07-22 10:57:25 +02:00
Laurent Destailleur
ad56cb4aa0 Fix upload of files should be possible on mobile device. 2015-07-21 18:27:34 +02:00
Gauthier
fa26b284a9 FIX : Line break display as a block 2015-07-21 16:39:00 +02:00
Laurent Destailleur
814cec880a Fix filter can be empty 2015-07-21 13:38:24 +02:00
Laurent Destailleur
268674899e Fix: css on current day 2015-07-21 12:30:12 +02:00
Laurent Destailleur
977d2d3463 Fix: The hook addCalendarChoice was only visible into tabs index.php 2015-07-21 12:19:21 +02:00
All-3kcis
d3f283a8d9 Correct api_key and error "DB_ERROR_RECORD_ALREADY_EXISTS" 2015-07-21 11:43:23 +02:00
Gauthier
f18c983ba5 NEW : print event type on third party card tab agenda list (only if AGENDA_USE_EVENT_TYPE = 1) 
Conflicts:
	htdocs/core/lib/company.lib.php
 2015-07-21 11:06:00 +02:00
Laurent Destailleur
9e35fd1bc3 Doc comments 2015-07-21 11:04:01 +02:00
Maxime Kohlhaas
646ad48bd0 Better fix for not numeric qty or discount 2015-07-21 10:50:07 +02:00
Maxime Kohlhaas
428bd14b55 Merge branch '3.5' of github.com:Dolibarr/dolibarr into 3.5 
# Veuillez entrer un message de validation pour expliquer en quoi cette fusion est
# nécessaire, surtout si cela fusionne une branche amont mise à jour dans une branche de sujet.
#
# Les lignes commençant par '#' seront ignorées, et un message vide
# abandonne la validation.
 2015-07-21 10:49:47 +02:00
Florian HENRY
82e9bf6b68 add test on test arrays with show/hide column 2015-07-21 09:38:43 +02:00
Florian HENRY
0179fd2860 Remove customer specifics comment 2015-07-21 09:15:35 +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
Laurent Destailleur
84be353e13 Comments 2015-07-21 00:13:13 +02:00
Raphaël Doursenaud
58acc31591 Qual: & should not be used in attributes 2015-07-20 20:48:49 +02:00
Raphaël Doursenaud
0d897a1307 NEW: log hooks loading 
This will help debugging bad hooks behavior.
 2015-07-20 18:30:49 +02:00
Laurent Destailleur
2bebb869fb Fix bad signature of fetch. The ref_ext is missing. 2015-07-20 17:19:44 +02:00
Laurent Destailleur
99c8a9211e Sync with transifex 2015-07-20 13:55:43 +02:00
Laurent Destailleur
d843b1fbe4 Fix: No html form tag inside a table tag. Must be out of table. 2015-07-20 13:03:12 +02:00
Laurent Destailleur
f0ed7dac09 Exclude tested module 2015-07-20 12:21:15 +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
Florian HENRY
7ce5424f9a NEW : upgrade jQuery Component Datable (and extras) to 1.10.7 2015-07-20 08:41:18 +02:00
Florian HENRY
0394c9d594 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-07-20 08:32:07 +02:00
Florian HENRY
798b7924b5 Fix test_arrays 2015-07-20 08:30:50 +02:00
Laurent Destailleur
2df2e8b44e Merge remote-tracking branch 'origin/3.8' into develop 2015-07-20 00:55:30 +02:00
Laurent Destailleur
c84b55e1af Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-20 00:55:03 +02:00
Laurent Destailleur
85f344a23e Fix bad link 
Fix missing css
 2015-07-19 23:39:07 +02:00
elarifr
80c8c30ba7 generate fake api_key to store if api module not enabled 
correct user role select if api module not enabled
 2015-07-19 22:43:06 +02:00
Laurent Destailleur
22ff1d7a71 Fix no space into translation key 2015-07-19 21:47:40 +02:00
Laurent Destailleur
c0146c2ce3 Fix missing translation key 2015-07-19 20:23:58 +02:00
Laurent Destailleur
705245d70d Revert "NEW : upgrade jQuery Component Datable (and extras) to 1.10.7 #3258" 2015-07-19 18:07:26 +02:00
Laurent Destailleur
c05900aece Merge pull request #3212 from FHenry/3.8 
NEW : upgrade jQuery Component Datable (and extras) to 1.10.7  #3258
 2015-07-19 16:02:59 +02:00
Laurent Destailleur
b59b7785ee Fix error management 2015-07-19 16:00:12 +02:00
Laurent Destailleur
fdbfc7facd Fix missing language load 2015-07-19 15:48:35 +02:00
Laurent Destailleur
cb98d6cb93 Merge remote-tracking branch 'origin/3.8' into develop 2015-07-19 15:32:20 +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
ad5612158a Fix report of all error messages 2015-07-19 15:29:18 +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
Laurent Destailleur
0402a1661c Fix: Sending email must be done after payment ok is shown and trigger 
has been ran.
 2015-07-19 14:40:18 +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
Laurent Destailleur
a5ffcb50ae Update admin.lang 
More complete description of module poll.
 2015-07-19 00:32:57 +02:00
Laurent Destailleur
eec1f4dcdf Merge pull request #3267 from Dolibarr/3.8 
fix user role and uk_user_api_key if api module not enabled
 2015-07-18 23:51:51 +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
aspangaro
b9b6abd7a8 Merge remote-tracking branch 'Upstream/3.8' into 3.8-1 2015-07-18 05:29:57 +02:00
Juanjo Menent
57f5c95894 Merge pull request #3261 from atm-gauthier/3.7_fix_trad_availability 
FIX : load propal langs for availability traduction
 2015-07-17 19:20:56 +02:00
Juanjo Menent
b7c18c9bef Merge pull request #3257 from aspangaro/3.8-patch10 
Fix: #3229 [Members] Cancelling member type creation yields weird bug
 2015-07-17 19:18:12 +02:00
Juanjo Menent
16b75fda31 Merge pull request #3256 from aspangaro/3.8-patch9 
Fix: #3242 [Dashboard] Checks waiting for deposit bad main menu
 2015-07-17 19:17:34 +02:00
Juanjo Menent
a5b5302806 Merge pull request #3255 from aspangaro/3.8-patch8 
Fix: #3253 #3252 #3251 Remove print_r
 2015-07-17 19:17:04 +02:00
Juanjo Menent
06684ea362 Merge pull request #3250 from aspangaro/3.8-patch7 
Fix: #3228 [Export] Missing member ID field in users
 2015-07-17 19:15:53 +02:00
Juanjo Menent
0971e88531 Merge pull request #3249 from aspangaro/3.8-patch6 
Fix: #3230 [Leaves] Module setup page is useless
 2015-07-17 19:15:31 +02:00
Juanjo Menent
9c6573edd4 Merge pull request #3248 from aspangaro/3.8-patch5 
Fix: #3232 [Agenda] Setup page tab order is weird
 2015-07-17 19:14:34 +02:00
Juanjo Menent
efde88d211 Merge pull request #3247 from aspangaro/3.8-patch4 
Fix: [Homepage] colspan problem with tasks box
 2015-07-17 19:13:44 +02:00
Juanjo Menent
59b8ae9c5e Merge pull request #3246 from aspangaro/3.8-patch3 
Fix: #3244 [Homepage] Last n members link broken
 2015-07-17 19:12:29 +02:00
Raphaël Doursenaud
953a21b55e FIX #3262 Webservice getProductsForCategory() 
Wrong variable name was used!
 2015-07-17 18:02:44 +02:00
Gauthier
244d1839e4 FIX : load propal langs for availability traduction 2015-07-17 17:24:11 +02:00
aspangaro
fb0f50cf4b Fix: #3229 [Members] Cancelling member type creation yields weird bug 2015-07-17 06:11:06 +02:00
aspangaro
e8d99323d4 Fix: #3242 [Dashboard] Checks waiting for deposit bad main menu 2015-07-17 05:39:08 +02:00
aspangaro
7b1976040d Error 2015-07-17 05:26:32 +02:00
aspangaro
5ce419922d Fix: #3253 #3252 #3251 Remove print_r 2015-07-17 05:22:29 +02:00
aspangaro
a0d74cc1a1 Fix: #3228 [Export] Missing member ID field in users 2015-07-16 22:50:50 +02:00
aspangaro
440e144892 Fix: #3230 [Leaves] Module setup page is useless 2015-07-16 22:29:04 +02:00
aspangaro
2d3d78ecc0 Fix: #3232 [Agenda] Setup page tab order is weird 2015-07-16 22:16:11 +02:00
aspangaro
f970494d1e Fix: [Homepage] colspan problem with tasks box 2015-07-16 21:29:15 +02:00
aspangaro
3b547c0979 Fix: #3244 [Homepage] Last n members link broken 2015-07-16 21:17:31 +02:00
aspangaro
23673cf464 Fix: ER vat rate don't show in pdf 2015-07-16 20:51:22 +02:00
Florian HENRY
4f9be3ba7e NEW : upgrade jQuery Component datable 1.10.7 2015-07-16 16:32:38 +02:00
Florian HENRY
77f100313c FIX : Remove customer specifics comment on contract num rules (blame me 
!)
 2015-07-16 16:08:38 +02:00
Florian HENRY
390239f505 re-add old file 2015-07-16 15:50:25 +02:00
Florian HENRY
30368053f7 NEW : upgrade version of ColVis datatable extra version 2015-07-16 15:47:57 +02:00
Florian HENRY
2b8e797c63 NEW : upgrade version of ColVis datable extre feature 2015-07-16 15:45:34 +02:00
Laurent Destailleur
e6aca8e4d3 Traduction manquante 2015-07-16 13:51:23 +02:00
Laurent Destailleur
9e39c73f5f Better translation 2015-07-16 13:28:40 +02:00
aspangaro
d9dd9ff688 Merge remote-tracking branch 'Upstream/3.8' into 3.8-1 2015-07-16 12:25:37 +02:00
Laurent Destailleur
1d0a8ceca9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-16 10:59:42 +02:00
Laurent Destailleur
e992a959cd Fix dbt_select 2015-07-16 10:59:00 +02:00
Laurent Destailleur
1a61ab055f Merge pull request #3207 from atm-ph/fix_37_translation_category 
FIX : translation for 1 word do not work
 2015-07-16 10:26:00 +02:00
Laurent Destailleur
e62595b00f Merge pull request #3204 from hregis/3.8_story2 
Fix: wrong translation
 2015-07-16 10:25:41 +02:00
Laurent Destailleur
085ecba1a3 Merge pull request #3203 from hregis/3.8_story 
Fix: for avoid mysql error with canvas
 2015-07-16 10:25:19 +02:00
Laurent Destailleur
670842429c Merge pull request #3202 from hregis/3.8_minor 
Fix missing mode
 2015-07-16 10:24:37 +02:00
Laurent Destailleur
1d83a2ea33 Merge pull request #3201 from hregis/3.8_layout 
Fix: for avoid jquery error in ECM module
 2015-07-16 10:23:02 +02:00
Laurent Destailleur
e11a8a0e0f Merge pull request #3195 from Darkjeff/develop 
Accountancy clean customer list
 2015-07-16 10:20:34 +02:00
Laurent Destailleur
49d4ff9b5b Merge pull request #3191 from fappels/3.8 
Fix #3120 Product Customer price not updated
 2015-07-16 10:16:39 +02:00
Laurent Destailleur
cbce66bba8 Merge pull request #3190 from hregis/3.8_bug2 
Fix: wrong path and add index.html
 2015-07-16 10:07:31 +02:00
Laurent Destailleur
24d8485b3d Merge pull request #3189 from hregis/3.8_bug 
Fix: avoid error if $mc object not exists
 2015-07-16 10:01:48 +02:00
aspangaro
4ae15adc69 Fix: wrong link on leave tabs in user card 2015-07-16 06:10:51 +02:00
aspangaro
214dbc1ce5 Fix: Opensurvey show description in view mode without fckeditor 2015-07-16 05:33:51 +02:00
aspangaro
8689b22e14 Product card: remove old code 2015-07-16 05:31:05 +02:00
aspangaro
f3c3bb708f Move <br> 2015-07-16 05:06:46 +02:00
Laurent Destailleur
11f434d422 Bad css 2015-07-16 01:02:20 +02:00
Laurent Destailleur
a66985a279 Restore backup feature 2015-07-16 00:58:05 +02:00
Laurent Destailleur
9037d2be50 Fix: test was done on wrong file 2015-07-16 00:20:46 +02:00
aspangaro
efbaeaab5c Fix: Show vat_by_thirdparty when module accounting is on 2015-07-15 23:24:28 +02:00
aspangaro
892462e0d6 Fix: Show VAT when module accounting is on 2015-07-15 22:45:45 +02:00
aspangaro
9aecfda78a Fix: Show project link 2015-07-15 21:55:09 +02:00
aspangaro
59e88590e0 Move my address email to new one 2015-07-15 20:30:33 +02:00
aspangaro
8b6a6d1da1 Fix: ER payment type don't show in card 2015-07-15 20:22:40 +02:00
aspangaro
e0b44d7954 ER: Add missing language key 2015-07-15 20:10:10 +02:00
aspangaro
fde252ca0e ER: Show ref instead of id in index 2015-07-15 20:04:37 +02:00
aspangaro
26ae9a6eb7 Fix: Donation payment type don't show in card 2015-07-15 19:54:51 +02:00
aspangaro
05dcb0d1ac Correct icon bank 2015-07-15 19:14:30 +02:00
aspangaro
4a899cd856 Typo 2015-07-15 19:13:23 +02:00
Laurent Destailleur
db67ab0b5e Fix wrap into lang list. 
Sync with transifex
 2015-07-15 16:27:01 +02:00
Laurent Destailleur
9f6ebcd123 Sync from transifex 2015-07-15 15:56:42 +02:00
Laurent Destailleur
e571f681a0 Fix can refuse expense report 2015-07-15 15:39:50 +02:00
Laurent Destailleur
66fcbeaf8d Fix: Translation missing 2015-07-15 15:11:23 +02:00
Laurent Destailleur
f48128baf7 Fix: default value of new expense report is not correctly set 2015-07-15 15:04:44 +02:00
phf
bde4503abd FIX : translation for 1 word do not work if product/service module are disabled because the translation search in products.lang 2015-07-15 14:46:29 +02:00
Laurent Destailleur
4d6ce2a1de Fix: Can't view thirdparties that are not customer nor prospect nor 
supplier.
 2015-07-15 12:42:50 +02:00
Laurent Destailleur
3ace940505 Move trans key into main 2015-07-15 11:27:34 +02:00
Regis Houssin
e6e39ae003 Fix: wrong translation 2015-07-14 17:28:19 +02:00
Regis Houssin
394f8fbf91 Fix: for avoid mysql error with canvas 2015-07-14 17:18:41 +02:00
Regis Houssin
c41c02adc7 Fix missing mode 2015-07-14 15:52:51 +02:00
Regis Houssin
bb631ff098 Fix: missing create object 2015-07-14 14:46:53 +02:00
Laurent Destailleur
65f11d0abb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-14 14:44:08 +02:00
Regis Houssin
1804dff0b8 Fix: for avoid jquery error in ECM module 2015-07-14 14:40:20 +02:00
Laurent Destailleur
e2831ce042 Better contrat on image colors 2015-07-14 12:24:24 +02:00
Maxime Kohlhaas
5223934ff0 Fix #3188 SQL error if qty or discount is not a number on proposal add line 2015-07-14 12:17:50 +02:00
Maxime Kohlhaas
20bdfdb286 Fix : withdrawal rejection were taking the total amount of the invoice instead of the amount of the withdrawal 2015-07-14 11:57:47 +02:00
Laurent Destailleur
581b6d0001 Fix: missing status on contacts 2015-07-14 11:51:27 +02:00
Darkjeff
fbf9e6b4b8 Clean Customer list 
Clean code
Add VAT research
If red line no case check
Remove comments
 2015-07-14 10:06:44 +02:00
BENKE Charlie
b7e148d183 Update 3.7.0-3.8.0.sql 2015-07-14 02:49:58 +02:00
Laurent Destailleur
85d9d3587e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-13 16:25:43 +02:00
Francis Appels
b113e6c6bf Fix #3120 Product Customer price not updated 
Re inserted product fetch was removed in commit
e43d4a6239
 2015-07-13 11:27:35 +02:00
Laurent Destailleur
a9289de616 Several fixes. Fix #2927 2015-07-13 11:22:18 +02:00
Laurent Destailleur
0c9e984bb1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-13 10:29:45 +02:00
Regis Houssin
6f1645f2f2 Fix: check if $mc object exists 2015-07-13 10:14:04 +02:00
Regis Houssin
f23afc3453 Fix: wrong path and add index.html 2015-07-13 10:07:38 +02:00
Regis Houssin
cf92f704d8 Fix: avoid error if $mc object not exists 
TODO check if user not linked with the current entity before change
entity (thirdparty, invoice, etc.) !!
 2015-07-13 09:54:26 +02:00
Laurent Destailleur
c20fbef304 Prepare 3.8 2015-07-12 23:44:35 +02:00
Laurent Destailleur
e31af7f914 Can filter list of setup constant on name and extend visibility to all. 2015-07-12 18:05:56 +02:00
Laurent Destailleur
11c94a9d3b Clean code 2015-07-12 16:50:27 +02:00
Laurent Destailleur
8690b5e70e FIX #3173 Overlapping of shipment ref 2015-07-12 16:22:06 +02:00
Laurent Destailleur
1fb40565f4 Fix bad parameters of function select_date 2015-07-12 12:50:24 +02:00
Laurent Destailleur
39a9b41c42 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-12 12:31:37 +02:00
Laurent Destailleur
21a5a30ade Merge pull request #3175 from All-3kcis/develop-patch-3 
Fix #3158 can't change date in invoices
 2015-07-12 12:21:46 +02:00
Laurent Destailleur
6f90605185 Fix: Sqlite can't be supported until alter table add constraint is 
supported by sqlite, so choice is hidden
 2015-07-12 11:44:37 +02:00
Laurent Destailleur
c83cb730fc Merge pull request #3134 from atm-alexis/NEW_add_hook_in_sendmail 
NEW add hook in send mail
 2015-07-11 20:46:01 +02:00
Raphaël Doursenaud
f4cc1f647c Fix #3183 Make sure FormOther class is included. 2015-07-10 15:20:41 +02:00
Laurent Destailleur
8d77667764 Bad stat report 2015-07-10 10:42:42 +02:00
Laurent Destailleur
688562a816 Fix regression: We can't yet set method __construct of DolibarrModules 
abstract because this break compatibility with a lot of external module
and generate FATAL errors after migration. Because PHP is not yet able
to manage try catch on FATAL error, we can't catch such error. Using
bstract on constructor is so postponed.
 2015-07-10 09:40:18 +02:00
Laurent Destailleur
3eb6ee2030 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-09 12:29:44 +02:00
Laurent Destailleur
c28ff6c257 NEW Add status into filters of graph 2015-07-09 12:29:01 +02:00
Juanjo Menent
f9757bf072 Merge pull request #3176 from aspangaro/develop-patch55 
Fix #3166 : An accounting account can be alphanumeric (Need for EBP)
 2015-07-09 09:45:59 +02:00
aspangaro
600354e057 Update formventilation with elarifr modification 2015-07-09 07:48:09 +02:00
aspangaro
9fdc2991c7 Correct 2015-07-09 07:47:31 +02:00
aspangaro
46037dbc46 Add language key 2015-07-09 07:47:13 +02:00
aspangaro
0b19f2e068 Update list.php with elarifr modification 2015-07-09 07:46:58 +02:00
aspangaro
d286c18148 Update lines.php with elarifr modification 2015-07-09 07:11:08 +02:00
aspangaro
dbb5d3d386 Fix #3166 : An accounting account can be alphanumeric (Need for EBP) 2015-07-08 21:47:45 +02:00
All-3kcis
6b54180678 Fix #3158 can't change date in invoices 2015-07-08 16:04:21 +02:00
Regis Houssin
9e7cb70d63 Fix: missing shared parameters 2015-07-08 16:03:15 +02:00
phf
f0f4d83664 FIX translate Jabberid on contact page with edit view 2015-07-08 12:33:37 +02:00
aspangaro
a283d0ce93 Update from elarifr 2015-07-08 07:46:26 +02:00
aspangaro
4c72567c6b Update bookkeeping 2015-07-08 07:19:23 +02:00
aspangaro
f084a9472a Merge remote-tracking branch 'Upstream/develop' into develop-54 2015-07-08 07:05:43 +02:00
Laurent Destailleur
455a697f1a Merge pull request #3159 from marcosgdf/develop 
FIX #2832: Fixed a problem with special characters in expense report PDF model
 2015-07-07 19:35:50 +02:00
Marcos García de La Fuente
eff573e753 Removed duplicated code from core modules 2015-07-07 13:08:26 +02:00
Marcos García de La Fuente
56ff0c7350 Created abstract functions DolibarrModules::__construct, DolibarrModules::init and DolibarrModules::remove 2015-07-07 13:08:12 +02:00
Marcos García de La Fuente
b7809c788a FIX #2832: Fixed a problem with special characters in expense report PDF model 2015-07-07 12:27:36 +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
aspangaro
787d2310c1 Correct language key 2015-07-07 05:57:35 +02:00
Laurent Destailleur
0fd134f825 Merge pull request #2889 from GPCsolutions/commonobjectreview 
[Qual] Reviewed commonobject
 2015-07-06 23:57:34 +02:00
Laurent Destailleur
00d2047e4c Merge pull request #3152 from GPCsolutions/install 
Install
 2015-07-06 23:55:14 +02:00
Laurent Destailleur
43c0e7e249 Merge pull request #3150 from marcosgdf/more-oop 
Created function SupplierInvoiceLine::update and added missing localtax1_type and localtax2_type properties
 2015-07-06 23:52:00 +02:00
BENKE Charlie
fc8daef78d increase size of libellé if we use paypal and email 
in case of long email the field is to small
 2015-07-06 17:46:36 +02:00
Raphaël Doursenaud
5ebc84e999 [Qual] Reviewed commonobject 
Added missing fields
Removed unused variables
Documented methods parameters
Checked return points
 2015-07-06 17:03:25 +02:00
Florian HENRY
b6850e36c9 fix previous commit 2015-07-06 16:59:03 +02:00
Raphaël Doursenaud
b508dce3ff Fix: jquery path 2015-07-06 16:48:10 +02:00
Raphaël Doursenaud
f3c319958f Fix: no PHP closing tag in generated files 
Best practice
 2015-07-06 16:39:49 +02:00
Raphaël Doursenaud
c28e863e2f Fix: jquery path 2015-07-06 16:39:42 +02:00
Raphaël Doursenaud
ef90cd39f8 Uniformized install logging 2015-07-06 16:34:31 +02:00
Raphaël Doursenaud
572ce7bcbb NEW: Rename install etape to step 2015-07-06 15:44:33 +02:00
Florian HENRY
ec89f00103 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-07-06 13:19:35 +02:00
Florian HENRY
8a36353385 FIX : when fetch_optionnal_by_label in Extrafields with $this->db cannot 
work because this->db is never instanciated
 2015-07-06 13:18:51 +02:00
Alexis ALGOUD
1277596242 Mode hook 
in $conf->global->MAIN_DISABLE_ALL_MAILS
 2015-07-06 00:51:17 +02:00
Laurent Destailleur
8eb4a208ce Debug statistics of project module 2015-07-05 22:04:30 +02:00
Marcos García de La Fuente
670596685f Created function SupplierInvoiceLine::update and added missing localtax1_type and localtax2_type properties 
Related to #2670
 2015-07-05 13:34:06 +02:00
Laurent Destailleur
089056f024 Filter on status on hierarchical view 2015-07-05 12:15:21 +02:00
aspangaro
627429326e Merge remote-tracking branch 'Upstream/develop' into develop-54 2015-07-05 05:59:10 +02:00
aspangaro
54d2a96d8e dir DOL_URL_ROOT 2015-07-05 05:56:45 +02:00
Laurent Destailleur
04ba12fab6 Add es_BO and fy_NL 2015-07-04 22:18:31 +02:00
Laurent Destailleur
1b6922fe81 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-04 18:20:34 +02:00
Laurent Destailleur
324d855b9c Still working on project module to uniformize way of working with other 
modules
 2015-07-04 18:20:17 +02:00
Laurent Destailleur
eef7c995da Merge pull request #3149 from aspangaro/develop-patch53 
Accountancy: Bank journal - Show user on salary payment & use new account to pay vat
 2015-07-04 17:37:07 +02:00
aspangaro
ea4b7b98a1 Merge remote-tracking branch 'Upstream/develop' into develop-53 2015-07-04 16:41:53 +02:00
aspangaro
fc3995c0be Accountancy: Bank journal - Show user on salary payment & user new account to pay vat 2015-07-04 16:39:52 +02:00
aspangaro
56831ecd16 Correct travis 2015-07-04 16:13:44 +02:00
aspangaro
7bf1ea2cac New: Task(#2567) Add accountancy code for VAT payments 2015-07-04 15:48:43 +02:00
aspangaro
d1111f9b90 Merge remote-tracking branch 'Upstream/develop' into develop-51 2015-07-04 15:01:11 +02:00
aspangaro
556db60f22 Fix: md_exp borders have different colors 2015-07-04 14:59:20 +02:00
Laurent Destailleur
d5a4a98c22 FIX #3138 - Too much visible thing when access is denied on public pages 2015-07-04 14:56:43 +02:00
Laurent Destailleur
251fedad48 NEW Can edit email template using WYSIWYG editor 2015-07-04 11:57:55 +02:00
Laurent Destailleur
45d27ae250 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-04 10:50:57 +02:00
Laurent Destailleur
e9b6a6a61e NEW Add filter on status on invoice list 2015-07-04 10:50:41 +02:00
Laurent Destailleur
56560d9379 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-04 10:49:01 +02:00
Regis Houssin
a9059247ca Merge branch '3.7' of https://github.com/Dolibarr/dolibarr.git into 3.7_bug3 2015-07-04 05:46:41 +02:00
Laurent Destailleur
ab01c40978 Merge pull request #3143 from marcosgdf/more-oop 
Created function SupplierInvoiceLine::fetch and SupplierInvoiceLine::delete
 2015-07-04 04:44:46 +02:00
Laurent Destailleur
42b4eaaeed Merge pull request #3142 from hregis/develop_new 
New: possibility to defined a tab for all entities in module descriptor
 2015-07-04 04:43:40 +02:00
Laurent Destailleur
b7715635a0 Merge pull request #3139 from aspangaro/develop-patch50 
Disable button add a line in bank module when accountancy module is activated
 2015-07-04 04:42:37 +02:00
Laurent Destailleur
5d588714f0 Merge pull request #3135 from atm-ph/3.6_fix_socpeople_country_display 
FIX : wrong display with contact country
 2015-07-04 04:41:20 +02:00
Laurent Destailleur
9321272838 Uniformize code 2015-07-04 04:34:14 +02:00
Laurent Destailleur
3520c94641 Merge pull request #3131 from atm-maxime/check_rejection 
New : Check rejection management
 2015-07-04 04:20:58 +02:00
Laurent Destailleur
7ad4d9056d Merge pull request #3117 from All-3kcis/patch-2 
Correct display of hours and minutes after action "Order"
 2015-07-04 04:14:12 +02:00
Laurent Destailleur
5015eb8a88 Merge pull request #3126 from aspangaro/develop-patch48 
Fix travis
 2015-07-04 04:13:32 +02:00
Laurent Destailleur
47f9184382 Merge pull request #3114 from aspangaro/develop-patch46 
Forms are using the tab look, even in creation mode
 2015-07-04 04:13:21 +02:00
Laurent Destailleur
bddee5d01f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-04 04:11:30 +02:00
Laurent Destailleur
5fafb08f91 Uniformize code 2015-07-04 04:11:16 +02:00
Laurent Destailleur
19158979ac Merge pull request #3122 from ywarnier/tva2 
Updates and additions to VAT reports
 2015-07-04 04:05:04 +02:00
Laurent Destailleur
4628c15684 Merge pull request #3141 from hregis/3.7_bug 
Fix: reset the current entity
 2015-07-04 03:46:40 +02:00
Laurent Destailleur
9eff436f5c Merge pull request #3136 from alainabbas/develop 
Correct bug #3050
 2015-07-04 03:45:46 +02:00
Laurent Destailleur
55dbc2dfe2 Merge pull request #3115 from sebhm/develop 
add hook addMoreActionsButtons
 2015-07-04 03:43:08 +02:00
Laurent Destailleur
97524687c7 Merge pull request #3113 from aspangaro/develop-patch44 
Add getNomUrl on accounting for an account
 2015-07-04 03:40:30 +02:00
Laurent Destailleur
a49c9c299e Merge pull request #3102 from aspangaro/develop-patch42 
HRM area : Show Ref instead of id for expense report
 2015-07-04 03:40:13 +02:00
Laurent Destailleur
9c80735310 An easier to use dictionary page to edit email template. 
Uniformize look.
 2015-07-04 03:28:52 +02:00
Laurent Destailleur
0ac43211ad NEW: Add help tooltips on fields of dictionary edit pages. 
Fix: visible list of tasks are for opened project only.
 2015-07-04 02:08:06 +02:00
aspangaro
4627e72f59 Debug && PSR2 2015-07-04 00:01:40 +02:00
Regis Houssin
e82f4c474b Fix: for avoid error with main context hooks, with $langs object for 
example.
 2015-07-03 22:14:34 +02:00
Marcos García de La Fuente
9415bdd828 Created function SupplierInvoiceLine::fetch and SupplierInvoiceLine::delete 2015-07-03 19:17:45 +02:00
Maxime Kohlhaas
5d14d05ce1 Fix : Social contribution payment deletion was not deleting the bank line 2015-07-03 16:38:54 +02:00
Laurent Destailleur
f320310304 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-03 16:24:17 +02:00
Laurent Destailleur
f06b66c5f0 Sync from transifex 2015-07-03 15:31:51 +02:00
Regis Houssin
e9aa98fb9d Fix: travis 2015-07-03 11:40:59 +02:00
Regis Houssin
4273c4aad9 Fix: data can be just a value, not an array 2015-07-03 11:35:11 +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
Regis Houssin
4fb5af7442 Fix: reset the current entity 2015-07-03 10:58:55 +02:00
Regis Houssin
e58957e603 Fix: broken feature: Check the entity because He may be the same 
reference in several entities
 2015-07-03 08:18:32 +02:00
aspangaro
111e44493a Disable button add a line in bank module when accountancy module is activated 2015-07-03 06:48:49 +02:00
Laurent Destailleur
312281f4d4 Debug askpricesupplier 
Try to continue work on position of menu entries.
 2015-07-02 22:43:51 +02:00
Laurent Destailleur
196a745086 NEW Can filter proposal, orders or invoices with criteria "contain at 
least one product with following tag"
 2015-07-02 22:07:13 +02:00
phf
c87328b362 FIX : contact country had wrong display if the country dont have translate 2015-07-02 17:00:37 +02:00
Alexis Algoud
25842b3295 NEW add hook in send mail 2015-07-02 16:03:24 +02:00
Maxime Kohlhaas
ee643ed2a7 Fix : Project list was not keeping parameters on sorts 2015-07-02 14:08:16 +02:00
Maxime Kohlhaas
84be022ee1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into check_rejection 
Conflicts:
	htdocs/compta/paiement/cheque/card.php
 2015-07-02 13:45:32 +02:00
aspangaro
39dbec144a Correct travis 2015-07-02 05:15:54 +02:00
Laurent Destailleur
6ef0b8e330 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-01 21:17:05 +02:00
Yannick Warnier
3a8c93522f Convert " " to \t to match custom coding conventions 2015-06-30 15:53:58 -05:00
Yannick Warnier
486a1547df Add language terms for extended VAT quarterly report 2015-06-30 15:51:24 -05:00
Yannick Warnier
c9e3cf9fa9 Introduce checkbox for extended customers VAT report 2015-06-30 15:50:35 -05:00
Yannick Warnier
066a7acbaa Minor - Improve PSR-2 support 2015-06-30 15:42:55 -05:00
Yannick Warnier
6cb69cdaba Minor - Fix date column title 2015-06-30 15:42:08 -05:00
Yannick Warnier
f0db9a3c3b Add non-local and local-only VAT customers reports to new quarterly report 2015-06-30 15:41:56 -05:00
Yannick Warnier
c3bb76340f Improve extended quaterly VAT report 2015-06-30 15:41:00 -05:00
Yannick Warnier
0cfd513b8c Add extended quaterly VAT report with additional information on dates and customers/suppliers 2015-06-30 15:39:15 -05:00
Yannick Warnier
8e974d024b Fix broken old queries in VAT's quadri.php 2015-06-30 15:37:22 -05:00
Laurent Destailleur
b766f99acc Uniformize look. 
Make code to manage link "Now" on calendar more generic.
 2015-06-30 21:50:24 +02:00
Laurent Destailleur
57a267a30f NEW Add hooks to allow an external module to complete list of events 
into calendar views.
 2015-06-30 17:09:52 +02:00
Laurent Destailleur
276f057acf Clean trigger codes 
Better error message when we insert duplicate barcode.
 2015-06-30 16:10:03 +02:00
Laurent Destailleur
c69a9996f1 Uniformize code 2015-06-30 15:12:15 +02:00
Laurent Destailleur
a29ca43943 Prepare merge of merge tools and invoice list 2015-06-30 14:32:17 +02:00
Laurent Destailleur
4a1dfa60a5 Uniformize code 2015-06-30 13:14:19 +02:00
All-3kcis
89c870225c Correct display of hours and minutes after action "Order" in supplier order. 2015-06-30 10:49:15 +02:00
aspangaro
ea703be39b Merge remote-tracking branch 'Upstream/develop' into develop-46 2015-06-30 06:33:10 +02:00
aspangaro
58dc11c958 Add language key 2015-06-30 06:31:46 +02:00
aspangaro
e363b20e85 Forms are using the tab look, even in creation mode 2015-06-30 06:31:09 +02:00
Laurent Destailleur
a8f1066faa Fix support of option to manage opportunities 2015-06-30 01:53:01 +02:00
Laurent Destailleur
ae5b779652 Uniformize code 2015-06-30 01:34:17 +02:00
sebhm
84e51eff3c add hook addMoreActionsButtons 
as in most Card, this hook is useful
 2015-06-29 22:36:41 +02:00
aspangaro
46407c1c22 Forms are using the tab look, even in creation mode 2015-06-29 21:58:38 +02:00
aspangaro
a762910f11 Add getNomUrl on accounting for account 2015-06-29 21:16:30 +02:00
Laurent Destailleur
5f07c18e06 NEW Add opportunity amount on project card. 2015-06-29 16:57:32 +02:00
aspangaro
7e54840cb6 Replace tabs with spaces 2015-06-29 13:12:37 +02:00
aspangaro
279d1d4320 Correct travis 2015-06-29 12:59:55 +02:00
Laurent Destailleur
9d1ca52492 Css fix 2015-06-29 11:22:03 +02:00
aspangaro
cb0aa41386 Debug 2015-06-29 06:48:39 +02:00
aspangaro
768042513d Merge remote-tracking branch 'Upstream/develop' into develop-42 2015-06-29 06:45:24 +02:00
aspangaro
cff82a5226 Use ref instead of rowid for expense report 2015-06-29 06:41:24 +02:00
Laurent Destailleur
dc050d39eb Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/adherents/type.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/js/lib_batch.js
	htdocs/core/modules/modUser.class.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/card.php
	htdocs/societe/consumption.php
	htdocs/user/info.php
	htdocs/user/note.php
	htdocs/user/param_ihm.php
	htdocs/user/perms.php
 2015-06-29 00:09:28 +02:00
Laurent Destailleur
9c99cae911 FIX XSS security using the onerror and missing escapement on type of 
member page.
 2015-06-28 23:32:38 +02:00
Laurent Destailleur
ce6039f7f6 NEW Replace category edition page on members with new select2 component. 2015-06-27 23:01:05 +02:00
Laurent Destailleur
b25d2ff00a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/main.inc.php
 2015-06-27 22:00:56 +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
Laurent Destailleur
9d7806f1f4 Tag class as deprecated 2015-06-27 21:26:05 +02:00
Regis Houssin
5efea745a1 Fix: Public method name must not be prefixed with an underscore 2015-06-27 20:38:11 +02:00
Regis Houssin
5ac292f9ae Fix: Private member variable must be prefixed with an underscore 2015-06-27 20:32:19 +02:00
Regis Houssin
bf9c7c8ef9 Fix: add private/public function 2015-06-27 20:26:40 +02:00
Regis Houssin
dfae24ded9 Fix: remove unused var 2015-06-27 20:20:27 +02:00
Regis Houssin
bfe7112308 Fix: change encrypt/decrypt method for avoid division by zero 2015-06-27 19:57:35 +02:00
Regis Houssin
ab558f8ea9 Fix: Use hooks (Multicompany) 2015-06-27 16:32:01 +02:00
Laurent Destailleur
55cb103ab0 Maxi debug of new module leave requests 2015-06-27 13:01:44 +02:00
Laurent Destailleur
b6efa5ed11 NEW Can upload files on leave requests. Use more standard permissions. 2015-06-27 11:45:23 +02:00
Laurent Destailleur
e02915cf8d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-27 09:56:57 +02:00
Laurent Destailleur
6ed99db818 Merge pull request #3107 from simnandez/develop 
Transifex Syncro
 2015-06-27 02:38:05 +02:00
Laurent Destailleur
faccb3666e Avoid to include tested module 2015-06-27 02:34:28 +02:00
Laurent Destailleur
be92f5e7a0 Fix syntax error 2015-06-27 02:31:26 +02:00
Laurent Destailleur
ceb9955efc Merge branch 'develop-patch43' of https://github.com/aspangaro/dolibarr into aspangaro-develop-patch43 
Conflicts:
	htdocs/contact/list.php
 2015-06-27 02:27:34 +02:00
Laurent Destailleur
6faf6eeb4f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-27 02:21:43 +02:00
Laurent Destailleur
461b5f0882 Merge pull request #3086 from atm-ph/3.6_fix_export_extrafield_select 
FIX : tool export extrafields
 2015-06-27 02:20:39 +02:00
Laurent Destailleur
b3d1df3786 Merge pull request #3109 from hregis/develop_new 
New: Possibility to add javascript in main login page with
 2015-06-27 02:19:50 +02:00
Laurent Destailleur
bae8ed2356 uniformize code 2015-06-27 02:19:46 +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
Maxime Kohlhaas
7486f2228d Debug : date fields were not transmitted by formconfirm 2015-06-26 18:50:57 +02:00
Maxime Kohlhaas
16ef029a80 Add function to manage check rejection 2015-06-26 18:50:31 +02:00
Juanjo Menent
0f046776d5 FIX #3091 TotalHT amount in supplier order is bold unlike the rest of 
Dolibarr
 2015-06-26 17:54:34 +02:00
Juanjo Menent
8b78ef5e18 Transifex Syncro 2015-06-26 17:45:02 +02:00
Juanjo Menent
ba97763ac4 Transifex Syncro 2015-06-26 17:40:47 +02:00
Laurent Destailleur
0fe0c989ca Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-26 17:36:54 +02:00
Juanjo Menent
a5b3c3476d Merge pull request #3106 from hregis/3.7_bug 
Fix: missing table
 2015-06-26 17:35:24 +02:00
Maxime Kohlhaas
f02ba45035 Allow to fetch a payment by its associated bank line id 2015-06-26 17:29:54 +02:00
Laurent Destailleur
2bc6d6dd4c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-26 17:26:12 +02:00
Laurent Destailleur
5584acddbd Content of popup tooltip on contact and login link 2015-06-26 17:21:03 +02:00
Maxime Kohlhaas
17a25ed4a1 Add date option to the formconfirm formquestion 2015-06-26 17:00:24 +02:00
Maxime Kohlhaas
175cffbec8 Debug : calendar must always be displayed on top of other layers 2015-06-26 16:59:19 +02:00
Regis Houssin
7ec13c9435 Merge remote-tracking branch 'origin/3.7' into 3.7_bug 2015-06-26 16:56:41 +02:00
Laurent Destailleur
8f691138e8 NEW Can edit Background color for Top menu and Background color for 
table title line (works only with theme menu eldy).
 2015-06-26 16:21:09 +02:00
Regis Houssin
46272cf4cd Fix: for avoid error with function "complete_head_from_modules" 2015-06-26 15:26:08 +02:00
Laurent Destailleur
57b0de25e2 NEW Add option THEME_ELDY_DISABLE_IMAGE to disable images into menu 
eldy.
 2015-06-26 14:44:06 +02:00
Laurent Destailleur
936c46d219 Better error/setup messages. 2015-06-26 13:18:40 +02:00
phf
582f9cd214 FIX : keep filter by category or by not enough stock if we switch page 2015-06-26 11:04:08 +02:00
aspangaro
f9831f908e Use print_liste_field_titre(); 2015-06-26 06:49:43 +02:00
aspangaro
9d2e964b00 Fix: print_liste_field_titre(''); 2015-06-26 06:23:29 +02:00
aspangaro
cd282568e8 Merge remote-tracking branch 'Upstream/develop' into develop-42 2015-06-26 05:39:05 +02:00
aspangaro
cb36a919b5 HRM area : Show Ref instead of id for expense report 2015-06-26 05:34:12 +02:00
alainabbas
efd3c4d863 Correct bug #3050 
when a piece is in draft and odt2pdf.sh is used, the filename is not corrected escaped for the shell
 2015-06-25 20:57:01 +02:00
Juanjo Menent
a3b3ce9c77 Merge pull request #3101 from FHenry/3.7 
FIX: multicompny bug with getEntites without shared test
 2015-06-25 20:50:03 +02:00
Juanjo Menent
967e7ea457 Merge pull request #3099 from GPCsolutions/dolibarr-3098 
Updated jQuery BlockUI plugin to a version compatible with shipped jQuery
 2015-06-25 20:46:41 +02:00
Juanjo Menent
ba984254a5 Merge pull request #3096 from GPCsolutions/replaceaddress 
Allow replacing the address block
 2015-06-25 20:45:26 +02:00
Juanjo Menent
0f6aaf1461 Merge pull request #3094 from aspangaro/develop-patch41 
Accounting - Add field to edit in admin
 2015-06-25 20:42:37 +02:00
Florian HENRY
9505d3a528 fix multicompny bug with getEntites without shared test 2015-06-25 17:22:37 +02:00
Raphaël Doursenaud
b219381e04 Fix #3098 Updated jQuery BlockUI plugin to 2.70.0 2015-06-25 15:47:26 +02:00
Raphaël Doursenaud
d6e48670e7 Allow replacing the address block 
Since ba2c0a2651 changed the default hook mode
from addreplace to output, this is needed to still be allowed to replace
the displayed address from a hook
 2015-06-25 11:13:23 +02:00
Fab
3adf6b1a73 Missing space after title tag. 
When using textwithpicto() from core/class/html.form.class.php, if you
are reading source code with firefox, you will see that a part of the
generated html is highlighted in red.

<td class="classfortooltip" title="title text"valign="top" width="14">

should be :

<td class="classfortooltip" title="title text" valign="top" width="14">
 2015-06-25 08:50:48 +02:00
aspangaro
e20da5511d Accounting - Add field to edit in admin 2015-06-25 06:54:19 +02:00
aspangaro
452733263d Move ACCOUNTING_VAT_ACCOUNT to ACCOUNTING_VAT_SOLD_ACCOUNT 2015-06-25 06:37:26 +02:00
Laurent Destailleur
1485ead215 Fix: MARGIN_TYPE == 2 is "using PMP price" so i remove a duplicate 
option to get same behaviour.
 2015-06-24 21:36:28 +02:00
Laurent Destailleur
a7aaa89e49 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-24 18:33:04 +02:00
Laurent Destailleur
02ce0bc6af Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-06-24 18:32:56 +02:00
Laurent Destailleur
c218843cdb FIX Save of filters into export profiles failed. 2015-06-24 18:29:29 +02:00
Juanjo Menent
759aec3925 Merge pull request #3084 from aspangaro/develop-patch37 
Fix: ER button set_paid & merge with old option setPaid
 2015-06-24 18:27:25 +02:00
Juanjo Menent
fc9d54fdaa Merge pull request #3088 from atm-maxime/develop 
New : add stats by qty on report turnover by product (+ clean code)
 2015-06-24 18:23:31 +02:00
Juanjo Menent
044edaaefc Merge pull request #3092 from FHenry/develop 
NEW : add extrafields into import product
 2015-06-24 18:20:47 +02:00
Juanjo Menent
9080470a64 Merge pull request #3089 from aspangaro/develop-patch39 
Fix travis
 2015-06-24 18:18:36 +02:00
Juanjo Menent
1d562be1f4 Merge pull request #3090 from fmarcet/3.7 
FIX: Payed invoices are showed as canceled
 2015-06-24 18:17:45 +02:00
Laurent Destailleur
fcc9fc6672 Fix translation 2015-06-24 16:54:44 +02:00
Florian HENRY
daab394c81 add extrafields into import product 2015-06-24 12:40:56 +02:00
fmarcet
c9c1247a28 FIX: Payed invoices are showed as canceled 
FIX: Bad date filter on customer order
 2015-06-24 09:01:39 +02:00
aspangaro
b4b5dedaa9 Merge remote-tracking branch 'Upstream/develop' into develop-39 2015-06-24 07:02:48 +02:00
aspangaro
f65234e44f Fix travis 2015-06-24 07:01:15 +02:00
Laurent Destailleur
0780c84012 Fix missing payment mode into export invoice profile 2015-06-23 23:58:04 +02:00
Laurent Destailleur
bdba8f1f38 Fix courrent outstanding amount not visible 2015-06-23 23:33:25 +02:00
Maxime Kohlhaas
5e9c85c789 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2015-06-23 20:03:46 +02:00
Francis Appels
63df278eca Fix: issue #3085 2015-06-23 19:28:18 +02:00
Laurent Destailleur
040a643ee9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/expensereport/card.php
	htdocs/projet/element.php
 2015-06-23 18:34:39 +02:00
Laurent Destailleur
a23e2511b9 Removed useless tab 2015-06-23 18:11:21 +02:00
phf
06962cb4e6 FIX : tool export handle the type "select" extrafields and return the value instead of id 2015-06-23 16:26:05 +02:00
Laurent Destailleur
27cc7ef2b3 Time spent 2015-06-23 10:13:08 +02:00
aspangaro
385857380b Remove old field 2015-06-23 06:39:55 +02:00
aspangaro
fae0a99a97 Merge remote-tracking branch 'Upstream/develop' into develop-37 2015-06-23 06:17:29 +02:00
Laurent Destailleur
460c926f98 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-22 22:32:00 +02:00
Laurent Destailleur
4db562c9e7 Tags are shown as thumbs into card. 2015-06-22 22:31:44 +02:00
Laurent Destailleur
afc4529f7f Merge pull request #3080 from open-minds/develop 
Remove useless filter for "text" parameter of boxes content
 2015-06-22 20:32:08 +02:00
Maxime Kohlhaas
fdf1d953a9 New : add stats by qty on report turnover by product (+ clean code) 2015-06-22 19:22:13 +02:00
Laurent Destailleur
bfa0f0d576 Minor look enhancement 2015-06-22 17:20:06 +02:00
Laurent Destailleur
cac7b1f49f NEW Add hooks on list of members to allow an external module to add more 
fields into list view.
 2015-06-22 16:34:25 +02:00
Laurent Destailleur
5a8e763099 Uniformize code for hooks 
Uniformize page name societe.php into list.php
 2015-06-22 15:48:48 +02:00
Laurent Destailleur
ea8279cf09 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-22 12:00:09 +02:00
Laurent Destailleur
a27212644e NEW Can add project search on left menu search area 2015-06-22 11:55:21 +02:00
aspangaro
134cea194d Debug 2015-06-22 06:53:43 +02:00
Laurent Léonard
ba64486e68 Remove useless filter for "text" parameter of boxes content 
This filter doesn't allow to display "0" value and is not applied to the similar "text2" parameter.
 2015-06-22 02:53:28 +02:00
Laurent Destailleur
6e1a5ca401 Merge pull request #3078 from aspangaro/develop-patch38 
Fix: Accountancy list: Use print_liste_field_titre
 2015-06-21 23:30:49 +02:00
Laurent Destailleur
5975536fcf Support type of leave. 2015-06-21 23:25:01 +02:00
aspangaro
e0ae7bd430 Merge remote-tracking branch 'Upstream/develop' into develop-37 2015-06-21 21:09:55 +02:00
Laurent Destailleur
7d1d1caf30 Debug withdraw module 2015-06-21 17:09:00 +02:00
Laurent Destailleur
230fd7a7e4 Debug withdraw module 2015-06-21 17:05:49 +02:00
aspangaro
390c670c5c Merge remote-tracking branch 'Upstream/develop' into develop-38 2015-06-21 14:35:45 +02:00
aspangaro
2ab454e757 Presentation 2015-06-21 14:32:00 +02:00
Laurent Destailleur
2612585d1c Merge pull request #3073 from atm-alexis/develop 
FIX hide product category if it's not enable
 2015-06-21 11:53:11 +02:00
Laurent Destailleur
8710065ca0 Merge pull request #3072 from atm-maximep/new_set_amount_for_withdraws 
NEW : Set amount for withdraws requests
 2015-06-21 11:52:23 +02:00
aspangaro
0f450edfcd Debug 2015-06-21 08:32:37 +02:00
aspangaro
0934860ce5 Accountancy list: Use print_liste_field_titre 2015-06-21 08:26:42 +02:00
aspangaro
f0a3057221 Fix: ER button set_paid & merge with old option setPaid 2015-06-21 08:07:06 +02:00
aspangaro
20582b9ea5 Merge remote-tracking branch 'Upstream/develop' into develop-36 2015-06-21 07:31:43 +02:00
Laurent Destailleur
d780c03651 Fix default buttone 2015-06-21 03:47:16 +02:00
Laurent Destailleur
4f1538f502 Introduce table llx_c_holiday_type 2015-06-21 03:19:15 +02:00
Laurent Destailleur
e0d1cbeb16 Introduce table llx_c_holiday_type 2015-06-21 00:07:03 +02:00
Laurent Destailleur
a3a5b0d9b0 Upgrade jquery and jquery-ui to last stable version 2015-06-21 00:06:37 +02:00
Laurent Destailleur
825369230f Finishment of look 2015-06-20 23:33:13 +02:00
Laurent Destailleur
2c5ef858d0 NEW Filter "active" by default on user list. 
Fix label of permission of project module
 2015-06-20 20:35:57 +02:00
Laurent Destailleur
40d17add22 Fix missing print 2015-06-20 19:42:07 +02:00
Laurent Destailleur
87b4381d47 Update jflot plugin 2015-06-20 19:17:50 +02:00
Laurent Destailleur
1cb9d3b2eb Fix nohover for lines to add lines 2015-06-20 17:40:36 +02:00
Laurent Destailleur
a6a027f5c4 Fix several pb with javascript 2015-06-20 17:24:34 +02:00
Laurent Destailleur
c2568020a5 Fix IBAN class is uppercase 2015-06-20 17:23:41 +02:00
Laurent Destailleur
32626c5ae6 Fix js refresh with autocomplete 2015-06-20 17:23:28 +02:00
Laurent Destailleur
ba5d6318ef Debug the integrity check feature. 2015-06-20 14:24:22 +02:00
Laurent Destailleur
a7ce414d23 Fix translation 2015-06-20 14:15:32 +02:00
aspangaro
0ff97da1ea Review ER : remove fk_c_tva and add option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT 2015-06-20 09:06:20 +02:00
Laurent Destailleur
2895241420 Update theme with 3.8 2015-06-19 17:03:35 +02:00
Laurent Destailleur
bbce287892 Fix: Pdf merge tool must see only pdf files 2015-06-19 16:05:04 +02:00
Alexis Algoud
d0999e5458 FIX hide category if it's not enable 2015-06-19 14:30:23 +02:00
maxime peyrot
f99a127a57 NEW : Enter amount for withdraws requests 2015-06-19 13:45:14 +02:00
Laurent Destailleur
2785bf7520 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-19 12:13:39 +02:00
Laurent Destailleur
b3c1ebf30a Debug price per customer 2015-06-19 12:13:05 +02:00
Laurent Destailleur
694481ae5e Merge pull request #3071 from aspangaro/develop-patch35 
Review accountancy
 2015-06-19 11:29:01 +02:00
Laurent Destailleur
5376c771d7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-19 11:27:59 +02:00
Laurent Destailleur
01fbee0e06 Merge branch 'develop-patch34' of https://github.com/aspangaro/dolibarr 
into aspangaro-develop-patch34

Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
 2015-06-19 11:27:15 +02:00
Laurent Destailleur
eac822d821 Merge pull request #3069 from aspangaro/develop-patch33 
Fix: Accountancy - SQL error & typo
 2015-06-19 11:23:43 +02:00
Laurent Destailleur
44d4d23c00 Fix phpcs 2015-06-19 11:21:36 +02:00
Laurent Destailleur
bfc8ccd761 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-19 11:19:23 +02:00
Laurent Destailleur
20da120a49 Merge tab to upload photo and other files to same tab. This reduce 
duplicate code and avoid users to be lost.
 2015-06-19 11:19:13 +02:00
Laurent Destailleur
0d7fea70a0 Merge pull request #3068 from atm-alexis/develop 
FIX can receive new batch product on supplier order
 2015-06-19 11:17:59 +02:00
Laurent Destailleur
b39d100e53 Merge pull request #3067 from All-3kcis/patch-1 
FIX complete function ordersupplier_prepare_head() so a module can remove tabs
 2015-06-19 11:16:15 +02:00
Laurent Destailleur
5d585393ef Merge pull request #3065 from aspangaro/develop-patch32 
New: Add payment into expense report card - Link to the bank module
 2015-06-19 11:15:14 +02:00
Laurent Destailleur
d99fd37f3d Merge pull request #3061 from marcosgdf/bug-timezone-2 
Corrected Timezone detection by using jstz external library
 2015-06-19 11:13:50 +02:00
aspangaro
ceaa71649c Review customer list ventilation page 2015-06-19 06:56:21 +02:00
aspangaro
14ad53848d Remove $linkback, lang & html 2015-06-19 06:32:51 +02:00
aspangaro
0c01295016 Fix travis 2015-06-19 06:19:10 +02:00
aspangaro
f60ca03140 Fix travis 2015-06-19 06:11:32 +02:00
aspangaro
22d81dec60 Merge remote-tracking branch 'Upstream/develop' into develop-32 2015-06-19 06:10:18 +02:00
aspangaro
fb57941b21 typo 2015-06-19 06:06:46 +02:00
aspangaro
4bda3a3f21 Merge remote-tracking branch 'Upstream/develop' into develop-33 2015-06-19 06:04:56 +02:00
aspangaro
d959c552f2 Fix: Accountancy - SQL error 2015-06-19 06:01:42 +02:00
Laurent Destailleur
b5cc7ae1c8 Work on merge tab photos and attached files 2015-06-19 00:52:58 +02:00
Laurent Destailleur
d8f86708b1 Minor look fix 2015-06-19 00:36:03 +02:00
Laurent Destailleur
bbc70004d9 Disable option that i can't understand. 2015-06-19 00:18:41 +02:00
Alexis Algoud
21f0fc8229 FIX can receive new batch product on supplier order 2015-06-18 19:49:19 +02:00
Laurent Destailleur
425d9bff48 Tooltip to make understanding better. 2015-06-18 19:33:29 +02:00
All-3kcis
c96c528d3e Correction complete_head 
Ajout de la fonction complete_head_from_modules() pour supprimer les onglets si besoin.
 2015-06-18 15:16:28 +02:00
Laurent Destailleur
7507a71121 Lenght of fields 2015-06-18 14:47:33 +02:00
Laurent Destailleur
29422a9ff9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-18 14:25:31 +02:00
Laurent Destailleur
a2e9ebe2d1 Fix hover is ok on boxes array too. 2015-06-18 14:25:13 +02:00
aspangaro
7539ad88fa Debug 2015-06-18 06:30:48 +02:00
aspangaro
9cf06ec21c Add function set_paid 2015-06-18 06:12:05 +02:00
Regis Houssin
9c6c3ad65d Fix: wrong user right 2015-06-17 16:33:18 +02:00
aspangaro
50aa36502c Merge remote-tracking branch 'Upstream/develop' into develop-32 
Conflicts:
	htdocs/expensereport/card.php
 2015-06-17 07:21:43 +02:00
aspangaro
8d0e7261f5 Debug 2015-06-17 07:19:25 +02:00
Laurent Destailleur
b2c1365eca Merge pull request #3056 from defrance69/patch-65 
added ref supplier bill
 2015-06-17 00:18:38 +02:00
Marcos García de La Fuente
1e05262884 Corrected Timezone detection by using jstz external library 2015-06-16 21:19:58 +02:00
Florian HENRY
6819e295f5 default charset utf-8 2015-06-16 20:22:01 +02:00
Laurent Destailleur
8df56511be NEW Enhance prototype, project list and proposal list with new hook to 
have an external module able to add more fields.
 2015-06-16 19:36:44 +02:00
fmarcet
05cb1f7ba7 Fix: Date filter on customer orders 2015-06-16 16:59:48 +02:00
Regis Houssin
3807fafc1a Fix: no error message if extrafield is require 2015-06-16 16:42:33 +02:00
BENKE Charlie
94341e83ed added ref supplier bill 
more useful to match supplier bill than internal ref
 2015-06-16 15:22:13 +02:00
Laurent Destailleur
b7c777dc07 Css fix 2015-06-16 15:14:33 +02:00
Laurent Destailleur
ef5ff2f218 Use the complete popup on user in user list and hierarchy view. 2015-06-16 15:08:20 +02:00
Laurent Destailleur
a52be15722 Enhance look for left menu seach form when HTML5 is on 2015-06-16 13:09:46 +02:00
Laurent Destailleur
fb1a3f3ea3 Rename alternative name 2015-06-16 12:04:11 +02:00
Laurent Destailleur
8b4e3096a6 Merge pull request #2412 from marcosgdf/commercial-name 
NEW [ task #851 ] Add a new field: Commercial name
 2015-06-16 11:44:03 +02:00
Laurent Destailleur
d3549cc2a0 Merge branch 'add_clone_on_event_agenda' of 
https://github.com/atm-gauthier/dolibarr into
atm-gauthier-add_clone_on_event_agenda

Conflicts:
	htdocs/langs/en_US/agenda.lang
 2015-06-16 11:41:45 +02:00
Laurent Destailleur
ceb0d71f54 Merge pull request #3054 from hregis/3.7_photos 
Fix: thumb "mini" not deleted
 2015-06-16 11:38:39 +02:00
Laurent Destailleur
417eae9c4f Merge remote-tracking branch 'origin/3.7' into develop 2015-06-16 11:18:51 +02:00
Laurent Destailleur
34468644ef Merge remote-tracking branch 'origin/3.5' into 3.6 2015-06-16 11:15:16 +02:00
Laurent Destailleur
9281e2a824 Merge pull request #3049 from marcosgdf/task-1191 
NEW [ task 1191 ] AJAX selector for projects
 2015-06-16 11:09:34 +02:00
Laurent Destailleur
dd661ca716 Merge pull request #3053 from aspangaro/develop-patch30 
Fix: ER Missing language key
 2015-06-16 11:08:21 +02:00
Laurent Destailleur
609eb26151 Merge pull request #3051 from aternatik/api 
Changes into API
 2015-06-16 11:08:14 +02:00
Regis Houssin
5e25c69891 Fix: thumb "mini" not deleted 2015-06-16 09:28:31 +02:00
Marcos García de La Fuente
45ebb18367 CodeSniffer corrections 2015-06-16 07:19:31 +02:00
aspangaro
2979815223 Update work on expensereport card 2015-06-16 06:56:58 +02:00
aspangaro
a1e383dafa Fix: ER Missing language key 2015-06-16 06:18:43 +02:00
aspangaro
d92eab49de Add the payment in bank module 2015-06-16 05:47:24 +02:00
aspangaro
2fb27b50ec Add payment page & class 2015-06-16 05:47:22 +02:00
aspangaro
a23994055a Add field and table in database & migration script 2015-06-16 05:47:19 +02:00
Laurent Destailleur
c56c228c7f Merge pull request #2924 from aternatik/api_rest 
Allow modify API key from user card
 2015-06-15 21:25:15 +02:00
Laurent Destailleur
cbac2dd63c Merge pull request #3052 from aternatik/fix_crlf 
Fix crlf
 2015-06-15 21:24:34 +02:00
jfefe
3bf1b60be8 Add test if module enabled before showing API information 2015-06-15 14:38:02 +02:00
jfefe
190ee35e86 Merge branch 'develop' into api_rest 
Conflicts:
	htdocs/user/card.php
	htdocs/user/class/user.class.php
 2015-06-15 14:29:34 +02:00
jfefe
745f0f7d7e Fix crlf 2015-06-15 14:24:24 +02:00
jfefe
80a6afc577 Add htaccess example for API usage 2015-06-15 14:11:53 +02:00
jfefe
00125d1060 Add option to set production mode to API 2015-06-15 14:11:43 +02:00
jfefe
da0fac2ac6 Minor fix into rest API : use implemented method name 2015-06-15 13:25:02 +02:00
Regis Houssin
d92448a772 Fix: phpcs ? 2015-06-15 12:09:32 +02:00
Marcos García de La Fuente
65d3f7968a NEW [ task 1191 ] AJAX selector for projects 2015-06-15 10:04:36 +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
Marcos García
adc1998b73 Fixed undefined variable typo 2015-06-15 09:18:58 +02:00
aspangaro
7ddec85fd2 Merge remote-tracking branch 'Upstream/develop' into develop-30 2015-06-15 05:22:12 +02:00
Laurent Destailleur
bcd254c137 Fix bad objet use. Add label of project into list. 2015-06-15 00:12:52 +02:00
aspangaro
a4acc867aa Typo "inra_vat" 2015-06-14 20:24:25 +02:00
aspangaro
f973a1fb43 Typo "cibility" 2015-06-14 20:15:22 +02:00
Laurent Destailleur
6263e90ddb More info on contact popup 2015-06-14 17:38:28 +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
1007aba6a9 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2015-06-14 17:02:11 +02:00
Laurent Destailleur
14a8a2269b FIX End log must use same level then start log. 2015-06-14 16:59:35 +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
Laurent Destailleur
f8d2e93878 Merge pull request #3044 from hregis/3.5_bug 
Fix: select date problem with mobile device (#3039)
 2015-06-14 15:29:35 +02:00
Laurent Destailleur
b42f9a6706 Fix phpcs 2015-06-14 15:16:29 +02:00
Regis Houssin
b96ed08260 Fix: select date problem with mobile device (#3039) 2015-06-14 12:46:27 +02:00
Regis Houssin
0e79bd5c74 Fix: select date problem with mobile device (#3039) 2015-06-14 12:34:28 +02:00
Laurent Destailleur
ec5330120c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-14 02:17:56 +02:00
Laurent Destailleur
fdced80a48 Merge pull request #3035 from marcosgdf/bug-2786 
FIX #2786 Objectline_add template shows "0" for non-vat suppliers
 2015-06-14 02:15:27 +02:00
Laurent Destailleur
aecc5d27a3 Merge pull request #3036 from hregis/3.7_bug 
Fix: broken feature: barcode search #3019
 2015-06-14 02:09:40 +02:00
Laurent Destailleur
a9bf38b8d3 Merge pull request #3022 from marcosgdf/bug-2976 
FIX Close bug #2976: "Report" tab is the current tab but it is not marked as selected by the UI
 2015-06-14 02:03:39 +02:00
Laurent Destailleur
c5dd3f4468 Merge pull request #3013 from GPCsolutions/dolibarr-2899 
Fix #2899: Reintroduce missing field
 2015-06-14 02:03:23 +02:00
Laurent Destailleur
03d1b4bac0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-14 01:52:59 +02:00
Laurent Destailleur
f67af6dac5 Merge pull request #3026 from marcosgdf/bug-2891 
FIX Close bug #2891 Category hooks do not work
 2015-06-14 01:40:12 +02:00
Laurent Destailleur
d5c26af563 Missing nohover css 2015-06-13 20:26:49 +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
Regis Houssin
f5168625d8 Fix: broken feature: barcode search #3019 2015-06-13 10:43:55 +02:00
Regis Houssin
296b76603a Merge remote-tracking branch 'origin/3.7' into 3.7_bug 2015-06-13 09:37:55 +02:00
Marcos García de La Fuente
ea625628ce Fix Close bug #2786 Objectline_add template shows "0" for non-vat suppliers 2015-06-13 03:39:06 +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
a496606826 Merge branch 'develop' into commercial-name 
Conflicts:
	htdocs/societe/soc.php
 2015-06-13 02:45:42 +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
5edfef2525 Merge pull request #3006 from hregis/develop_productprice 
Fix: disable hook calling
 2015-06-12 21:38:14 +02:00
Juanjo Menent
deff75d2ac Merge pull request #3007 from hregis/develop_origin 
Fix: possibility to show icon pdf, dot, doc, etc...
 2015-06-12 21:37:07 +02:00
Juanjo Menent
da535b08e5 Merge pull request #3027 from marcosgdf/bug-2855 
FIX Close bug #2855 Wrong translation key in localtax report page
 2015-06-12 21:30:02 +02:00
Juanjo Menent
567dece678 Merge pull request #3011 from GPCsolutions/3.7-3009 
FIX #3009: Better filtering to prevent SQL injection
 2015-06-12 21:26:14 +02:00
Juanjo Menent
10d27ea594 Merge pull request #3012 from fmarcet/3.7 
Fix: Not reading external barcode numeration module
 2015-06-12 21:24:49 +02:00
Juanjo Menent
0596be1656 Merge pull request #3008 from hregis/develop_strict 
Fix: ereg more simple
 2015-06-12 21:24:13 +02:00
Juanjo Menent
648719efdd Merge pull request #3015 from fmarcet/develop 
New: Add due date filter on invoices lists
 2015-06-12 21:18:31 +02:00
Juanjo Menent
9dad0add61 Merge pull request #3014 from GPCsolutions/dolibarr-2987 
FIX #2987: removed dead function moneyMeter()
 2015-06-12 21:07:15 +02:00
Juanjo Menent
609b1291c7 Merge pull request #3016 from GPCsolutions/dolibarr-2571 
Added tag/categories management to contact card
 2015-06-12 21:04:29 +02:00
Juanjo Menent
56ba4ea3d4 Merge pull request #3018 from open-minds/develop 
Rename "duree" property of interventions to "duration"
 2015-06-12 21:03:36 +02:00
Juanjo Menent
2522cf7a0f Merge pull request #3024 from GPCsolutions/categoriesfix 
Fix: missing categories class in customer/prospect card
 2015-06-12 21:02: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
0335892521 FIX Close bug #2861 Undefined variable $res when migrating from 3.6.2 to 3.7.0 2015-06-12 18:31:49 +02:00
Laurent Destailleur
1c280a9219 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/theme/eldy/style.css.php
 2015-06-12 16:29:50 +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
Laurent Destailleur
f58bd37067 Css 2015-06-12 16:22:32 +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
Raphaël Doursenaud
4e143755e8 Fix: missing categories class in customer/prospect card 
Also check that the categories module is enabled and user has permissions to see categories
 2015-06-12 15:56:39 +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
1a2bde14fb FIX Better management error into the color conversion functions 2015-06-12 14:37:27 +02:00
Laurent Destailleur
4a726f6315 Fix css 2015-06-12 13:44:03 +02:00
Laurent Destailleur
4e5ed08ff8 Clean code 2015-06-12 13:21:21 +02:00
Laurent Destailleur
ed0e6753e3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-12 13:09:32 +02:00
Laurent Léonard
a337b6f874 Rename "duree" property of interventions to "duration" 
This also fixes the display problem of total duration on the "soleil" document model
 2015-06-11 23:18:29 +02:00
Laurent Destailleur
d2843ceabb Add field frstrecur to be managed by withdrawal module. 2015-06-11 19:16:29 +02:00
Laurent Destailleur
3678a12767 NEW Can assign a task to yourself to have it appear on timesheet 2015-06-11 18:27:59 +02:00
Raphaël Doursenaud
6465e58032 Added tag/categories management to contact card 
Contact part of #2571
 2015-06-11 14:50:13 +02:00
fmarcet
42b04102ba New: Add due date filter on invoices lists 2015-06-11 12:40:16 +02:00
Raphaël Doursenaud
36486d6329 FIX #2987: removed dead function moneyMeter() 2015-06-11 10:57:08 +02:00
Raphaël Doursenaud
3f2b543ae4 Fix #2899: Reintroduce missing field 2015-06-11 10:53:40 +02:00
fmarcet
5783c185bd Fix: Not reading external barcode numeration module 2015-06-11 10:43:12 +02:00
Raphaël Doursenaud
4ee6c1810e FIX #3009: Better filtering to prevent SQL injection 2015-06-11 10:38:29 +02:00
Raphaël Doursenaud
d89955047b FIX #3009: Better filtering to prevent SQL injection 2015-06-11 10:37:30 +02:00
Regis Houssin
e3d1614004 Fix: ereg more simple 2015-06-11 09:21:44 +02:00
Regis Houssin
a51a8aff59 Fix: possibility to show pdf, dot, doc, etc... 2015-06-11 09:12:24 +02:00
Regis Houssin
3fd7c26cf1 Fix: disable hook calling 2015-06-11 07:52:58 +02:00
Juanjo Menent
0de3f8ac98 Merge pull request #3000 from hregis/develop_origin 
Fix: Strict standards: Only variables should be passed by reference
 2015-06-10 21:14:01 +02:00
Juanjo Menent
49b369035a Merge pull request #3002 from hregis/develop_productprice 
NEW: add "productpricecard" hook and uniformize code
 2015-06-10 21:13:01 +02:00
Juanjo Menent
4d0734950d Merge pull request #3003 from GPCsolutions/dolibarr-3001 
Fix #3001: the current code needs an array, not an object
 2015-06-10 21:12:02 +02:00
Juanjo Menent
680269da26 Merge pull request #3004 from hregis/develop_strict 
Fix: strict mode hunter
 2015-06-10 21:11:07 +02:00
Raphaël Doursenaud
95debcc376 Fix nophoto image path on company admin 2015-06-10 19:49:09 +02:00
Regis Houssin
c21156dd13 Fix: strict mode hunter 2015-06-10 18:58:42 +02:00
Raphaël Doursenaud
2629e47f77 Fix #3001: the current code needs an array, not an object 2015-06-10 18:45:10 +02:00
Regis Houssin
e43d4a6239 NEW: add "productpricecard" hook and uniformize code 2015-06-10 18:42:16 +02:00
Regis Houssin
edd5c33c5b Fix: Strict standards: Only variables should be passed by reference 
http://geoffray.be/blog/php/only-variables-should-be-passed-by-reference
 2015-06-10 18:22:47 +02:00
Juanjo Menent
7f06727c56 Merge pull request #2996 from aspangaro/develop-patch28 
NEW: Add a tab document in donation card
 2015-06-10 17:37:17 +02:00
Regis Houssin
14780747fc Merge remote-tracking branch 'dolibarr/3.7' into 3.7 2015-06-10 16:00:42 +02:00
Laurent Destailleur
488257d180 Fix bad coding 2015-06-08 22:16:00 +02:00
aspangaro
592d124f26 Merge remote-tracking branch 'Upstream/develop' into develop-28 2015-06-08 21:33:45 +02:00
aspangaro
1d1f19b976 NEW: Add a tab document in donation card 2015-06-08 21:28:32 +02:00
Laurent Destailleur
9b7982bf0c Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/core/class/html.form.class.php
	htdocs/fourn/facture/card.php
	htdocs/theme/eldy/style.css.php
 2015-06-08 18:28:50 +02:00
Laurent Destailleur
05a653ee5f Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/core/class/html.form.class.php
 2015-06-08 18:21:16 +02:00
Laurent Destailleur
f9d85973aa Merge remote-tracking branch 'origin/3.5' into 3.6 2015-06-08 18:18:37 +02:00
Laurent Destailleur
35dd069ec9 Fix #2994 2015-06-08 18:17:13 +02:00
Laurent Destailleur
b61f7dda0b Merge pull request #2990 from GPCsolutions/dolibarr-2985 
Make default avatar images public to allow Gravatar proxying
 2015-06-08 17:53:37 +02:00
Laurent Destailleur
7da33519a9 Merge pull request #2989 from GPCsolutions/dolibarr-2988 
Use rfc6761 example.com domain instead of domain.com in examples
 2015-06-08 17:51:08 +02:00
Laurent Destailleur
3ed200766c Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-06-08 17:38:59 +02:00
Laurent Destailleur
9e1dd42b56 Fix #2986 2015-06-08 17:38:33 +02:00
Laurent Destailleur
5d4bbc457a Fix #2987 Removed deprecated page 2015-06-08 17:30:15 +02:00
Raphaël Doursenaud
4aee11e54b Make default avatar images public to allow Gravatar proxying 
Fix #2985
 2015-06-08 17:23:02 +02:00
Raphaël Doursenaud
143a7d7328 Use rfc6761 example.com domain instead of domain.com in examples 
Fix #2988
 2015-06-08 17:13:23 +02:00
Raphaël Doursenaud
08c9dd358d FIX #2983 Load gravatar avatar images securely over HTTPS 2015-06-08 15:51:41 +02:00
Laurent Destailleur
df1dfcbd8a NEW Can filter proposal on a tag of a product 
Enhance also the prototype test_arrays to include select form before
table.
 2015-06-08 15:07:37 +02:00
Gauthier
dd81d3a762 NEW : add all assigned users and all extrafields data in new event when we createFromClone 2015-06-08 15:06:43 +02:00
Laurent Destailleur
e9526066b7 Prepare edition of field "bydefaultinlist" for extrafields. 2015-06-08 14:12:57 +02:00
Laurent Destailleur
4a18b730b5 Fix: Avoid warning in expense report validation 
Fix: navigation in expense report
 2015-06-08 13:49:09 +02:00
Gauthier
053cfac262 NEW : clone action on agenda events 2015-06-08 12:39:25 +02:00
Laurent Destailleur
1e0218bb9b Merge pull request #2784 from aaujon/3.7-webservices-fix 
various fixes on webservices
 2015-06-08 10:37:29 +02:00
Laurent Destailleur
a85f664b7a Merge pull request #2950 from defrance69/patch-64 
if duration is present on service, we use it
 2015-06-08 10:35:23 +02:00
Laurent Destailleur
7f16eea13b Merge pull request #2978 from hregis/3.7-bug 
Fix: use dash instead underscore and add filter for "dol_most_recent_files" for avoid conflict
 2015-06-08 10:35:00 +02:00
Regis Houssin
8d824785f0 Merge remote-tracking branch 'dolibarr/3.7' into 3.7 2015-06-08 10:03:34 +02:00
Juanjo Menent
dc3ae22379 Merge pull request #2980 from hregis/3.7_crash 
Close #2951
 2015-06-08 09:46:39 +02:00
Regis Houssin
792911b14f Revert "Fix: Drop foreign key for avoid Mysql crash" 
This reverts commit 65b049fdf5.
 2015-06-08 09:28:53 +02:00
Regis Houssin
de0dd5da60 Fix: Drop foreign key for avoid Mysql crash 2015-06-08 09:14:46 +02:00
Regis Houssin
65b049fdf5 Fix: Drop foreign key for avoid Mysql crash 2015-06-08 09:13:21 +02:00
aspangaro
67c9a95ffb FIX: Correct migration script 2015-06-08 05:28:12 +02:00
BENKE Charlie
bcf9bdc92e Update card.php 
new setting vars FICHINTER_USE_SERVICE_DURATION
 2015-06-07 23:18:51 +02:00
Laurent Destailleur
101a9a4cf3 Fix: object user must not be overwritten 2015-06-07 19:35:47 +02:00
Laurent Destailleur
37cadaf4bf Fix the trigger on delete thirdparty was not called 2015-06-07 03:41:12 +02:00
Laurent Destailleur
dd08d5d660 Fix bad parameter for PUT method 2015-06-07 03:39:43 +02:00
Laurent Destailleur
536f565d4e Fix Return value is always utf8 encoded and without entities. 2015-06-07 02:47:28 +02:00
Laurent Destailleur
c4ccf6f744 Fix: Missing the delete command 2015-06-07 00:06:11 +02:00
Laurent Destailleur
b89473383c Fix phpcs 2015-06-06 16:41:11 +02:00
Laurent Destailleur
02dbe16366 Mutualize code to show block to link an element to another one. 2015-06-06 15:57:59 +02:00
Laurent Destailleur
1652f80300 Memory optimizing. Save 2.3 Mb of memory for all forms that can show 
margin informations. Save 300 Kb of memory for all other pages.
 2015-06-06 15:19:25 +02:00
Laurent Destailleur
8d84dd1155 Uniformize code 2015-06-06 14:34:57 +02:00
Laurent Destailleur
89f77f5e2b Uniformize code 2015-06-06 14:21:18 +02:00
Arnaud Aujon
3fad8ffa80 Merge remote-tracking branch 'upstream/develop' into 3.7-webservices-fix 2015-06-06 13:39:37 +02:00
Laurent Destailleur
1880ed701f Uniformize code 2015-06-06 13:22:15 +02:00
Regis Houssin
9a812a6c28 Fix: add filter for "dol_most_recent_files" for avoid conflict with 
option "Save file on server with name "FA0700034-Original filename""
 2015-06-06 13:03:02 +02:00
Laurent Destailleur
f42065146a Start to clean html.form class. 2015-06-06 12:26:47 +02:00
Laurent Destailleur
fad44a068d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-06 11:48:28 +02:00
Laurent Destailleur
1df1a0cd2a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-06 00:14:28 +02:00
Laurent Destailleur
13001a5e9c Fix #2909 2015-06-06 00:13:58 +02:00
Laurent Destailleur
6331290056 Fix phpcs 2015-06-05 20:23:04 +02:00
Laurent Destailleur
4bac36d810 Merge pull request #2972 from FHenry/develop 
fix bug in upgare2.php script (test $res after affect it should be better)
 2015-06-05 19:06:41 +02:00
Laurent Destailleur
50fba5c506 Merge pull request #2970 from GPCsolutions/dolibarr-2969 
Add missing ; to database password encryption instructions
 2015-06-05 19:04:47 +02:00
Laurent Destailleur
b7cf070d2d Fix phpcs 2015-06-05 18:43:14 +02:00
Laurent Destailleur
b57f0a0e5f Fix option to use old path for product is for compatibility if user come 
from 3.6 or lower. Must not be enabled on 3.7.0 or +.
 2015-06-05 18:32:49 +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
91f4fccb21 Remove warning 2015-06-05 18:26:12 +02:00
Florian HENRY
98c5a75a7e fix bug in upgare2.php script (test $res after affect it should be 
better)
 2015-06-05 17:51:20 +02:00
Raphaël Doursenaud
7808c5a5ad Add missing ; to database password encryption instructions 
Fix #2969
 2015-06-05 17:14:53 +02:00
Laurent Destailleur
1252a500ce Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/fourn/class/fournisseur.product.class.php
 2015-06-05 16:50:46 +02:00
Laurent Destailleur
30f6cd08cf Merge pull request #2943 from aspangaro/develop-donation2 
New: Add object ot the company & Add picture cerfa logo
 2015-06-05 15:58:47 +02:00
Laurent Destailleur
7e3a457f85 Merge pull request #2942 from aspangaro/develop-donation 
Fix: Donation error on admin tab & Fix: Input disabled by default
 2015-06-05 15:57:35 +02:00
Laurent Destailleur
51d275ee77 Merge pull request #2941 from atm-gauthier/3.7 
FIX : When we clone a propal, if it has a project which is not assign…
 2015-06-05 15:56:36 +02:00
Laurent Destailleur
eebb93f435 Merge pull request #2940 from GPCsolutions/restapireview 
Fixed some coding style issues
 2015-06-05 15:55:15 +02:00
Laurent Destailleur
689d3e39f2 Merge pull request #2939 from FHenry/develop 
NEW Add control another invoice supplier already exists for created from supplier order (as it is done on customer invoice)
 2015-06-05 15:46:59 +02:00
Laurent Destailleur
67a9fa529f Merge pull request #2241 from defrance69/patch-44 
Update task.php
 2015-06-05 15:45:50 +02:00
Laurent Destailleur
df60754e52 Merge pull request #2708 from GPCsolutions/deprecated 
Deprecated
 2015-06-05 15:44:08 +02:00
Laurent Destailleur
3c8d54d55f Merge pull request #2938 from FHenry/3.6 
FIX : If supplier invoice block linked element is display after other  block total HT amount is not reset to 0 and sum other block (like customer orders values)
 2015-06-05 15:43:25 +02:00
Laurent Destailleur
b98999c9d9 Can't delete a project 2015-06-05 15:41:27 +02:00
Laurent Destailleur
ee986b1a2b Debug merge thirdparty feature. 2015-06-05 15:15:05 +02:00
Laurent Destailleur
a33241f487 Maxi debug of 3.8. Nearly ready for freeze. 2015-06-05 14:46:30 +02:00
Laurent Destailleur
5e2d9efa07 Maxi debug of 3.8. Nearly ready for freeze. 2015-06-05 14:02:50 +02:00
Maxime Kohlhaas
f7493de50c Fix : supplier order clone was buggy if notes contains apostrophe 2015-06-05 13:42:29 +02:00
Laurent Destailleur
4c7ccf6145 NEW Can filter on contact status in prospect list. Removed deprecated 
menu entry.
 2015-06-05 10:49:02 +02:00
Laurent Destailleur
14b1fb845f Remove useless tab of categories 2015-06-05 09:57:41 +02:00
Laurent Destailleur
bbd8a712cf Merge pull request #2932 from GPCsolutions/dolibarr-2571 
Added tags/categories management to customers
 2015-06-05 09:44:06 +02:00
Regis Houssin
e78dba809b Fix: PRODUCT_USE_OLD_PATH_FOR_PHOTO use entity 0 for multicompany 
Fix: use encrypt/decrypt with llx_const for experimental encryption of
sensitive data
 2015-06-05 09:42:21 +02:00
Laurent Destailleur
7c3f94d350 Merge pull request #2955 from hregis/develop_origin 
Fix: use encrypt/decrypt with llx_const for experimental encryption in
 2015-06-05 09:35:25 +02:00
Laurent Destailleur
a605040eac Merge pull request #2947 from aspangaro/develop-patch24 
NEW Forms are using the tab look, even in creation mode
 2015-06-05 09:34:52 +02:00
Laurent Destailleur
ce104116f4 Merge pull request #2931 from GPCsolutions/dolibarr-2922 
Standardize categories types/ids management
 2015-06-05 09:09:14 +02:00
Laurent Destailleur
a1391ba8b7 Merge pull request #2959 from aspangaro/develop-patch22 
Fix: wrong file & problem to install model
 2015-06-05 09:07:29 +02:00
Laurent Destailleur
5edef2f02f NEW A module can add its entries into cron module. 2015-06-05 03:32:09 +02:00
aspangaro
fc5ea9f20f Fix: wrong file & problem to install model 2015-06-04 21:14:30 +02:00
jfefe
195a1b2708 FIX #2957 : missing $langs object for trigger 2015-06-04 18:10:29 +02:00
Regis Houssin
5139954365 Fix: add filter in "dol_most_recent_files" for avoid conflict with 
option "Save file on server with name "FA0700034_Original filename""
 2015-06-04 16:39:39 +02:00
Regis Houssin
e1136b4758 Fix: use encrypt/decrypt with llx_const for experimental encryption in 
database of sensitive data
 2015-06-04 15:50:31 +02:00
Regis Houssin
6a3310daf7 Fix: PRODUCT_USE_OLD_PATH_FOR_PHOTO use entity 0 for multicompany 
Fix: use encrypt/decrypt with llx_const for experimental encryption of
sensitive data
 2015-06-04 15:42:51 +02:00
Laurent Destailleur
047390f661 Fix missing loading of language files 2015-06-04 13:58:15 +02:00
BENKE Charlie
2164729bad if duration is present on service, we use it 
not logic to entered always 1h
 2015-06-04 13:34:08 +02:00
Laurent Destailleur
1f92f542a6 NEW Hidden option THEME_ELDY_USE_HOVER is stable enough to become 
officialy visible into setup.
 2015-06-04 13:32:21 +02:00
Laurent Destailleur
fa01dc200d NEW Add hidden option MAIN_MAILFORM_DISABLE_ENTERKEY to disable the key 
enter into the form to send email.
 2015-06-04 12:57:49 +02:00
Laurent Destailleur
331ebbdd73 Fix behaviour on grey/visible menu must be same everywhere on 
application.
 2015-06-04 11:42:24 +02:00
Laurent Destailleur
8010cb7f33 Fix the extracss parameter was overwritten other css into 
textwithtooltip function.
Add tooltip on THM and TJM parameter of user.
 2015-06-04 10:42:12 +02:00
aspangaro
eb5dedab1a NEW Forms are using the tab look, even in creation mode 2015-06-04 06:40:53 +02:00
Laurent Destailleur
f437bd2d6d FIX No check warehouse is provided if module stock is not enabled. 2015-06-03 21:21:20 +02:00
Laurent Destailleur
dd8a0b849a NEW If module salaries is on, you can set a hourly value for tome 
consumed by users. Each time a user enter its time consumed on a
project, a calculation is done to provide the cost for human services.
This value appears into the "Transversal view" of project.
 2015-06-03 21:01:50 +02:00
Laurent Destailleur
995645800e Fix loading of project 2015-06-03 18:24:09 +02:00
Laurent Destailleur
c57693a245 Fix bad param on select box for project 2015-06-03 18:08:30 +02:00
Laurent Destailleur
1411772c81 Fix sql error 2015-06-03 17:07:46 +02:00
Laurent Destailleur
d109c78c6b Fix label of project was not visible 2015-06-03 16:59:48 +02:00
Laurent Destailleur
76865c00b5 NEW The line where mouse is over can be highlight with option 
THEME_ELDY_USE_HOVER (on by default)
 2015-06-03 16:49:22 +02:00
Laurent Destailleur
4adeb8980d NEW Add ref and label of project into export 2015-06-03 16:40:02 +02:00
Laurent Destailleur
f7eaf35d30 NEW When creating order, proposal or invoice from thirdparty card, the 
project is asked during creation. A link to create project if it does
not exists is also available.
NEW Uniformize form creation of proposal to add public and private notes
during creation like done for order and invoice.
 2015-06-03 11:55:39 +02:00
aspangaro
3461a8712a New: Add object of the company - Needed for donation 2015-06-03 06:48:15 +02:00
aspangaro
aa9951948b New: Add logo cerfa in common themes files 2015-06-03 06:02:52 +02:00
aspangaro
bde91633da Fix: input of french article is disabled by default 2015-06-03 06:01:05 +02:00
aspangaro
d28a56c8ac Correct travis 2015-06-03 05:49:43 +02:00
aspangaro
ef88a04f93 Fix: Donation error on admin tab 2015-06-02 20:41:02 +02:00
Gauthier
3f4ded4780 FIX : When we clone a propal, if it has a project which is not assigned to a third, it was not on new propal because fk_project was always set to empty string if new propal is for another third. 2015-06-02 16:06:03 +02:00
Raphaël Doursenaud
9b747a12aa Fixed some coding style issues 2015-06-02 15:13:52 +02:00
Florian HENRY
061e675b51 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-02 13:02:06 +02:00
Florian HENRY
3b3319e435 Add contrl invoice supplier already exists (as it is done on customer 
invoice)
 2015-06-02 13:01:51 +02:00
Florian HENRY
fb29fa486a FIX : total amount in tpl linked object are not reset 2015-06-02 11:20:08 +02:00
Florian HENRY
bdaf83a653 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2015-06-02 08:42:13 +02:00
Florian HENRY
3f1613197e FIX : If supplier invoice block linked element is display after other 
block total HT amount is not reset to 0 and sum other block (like
customer orders values)
 2015-06-02 08:41:42 +02:00
Laurent Destailleur
912358f731 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-01 21:38:13 +02:00
Laurent Destailleur
acd693b513 Fix phpcs 2015-06-01 21:37:09 +02:00
Laurent Destailleur
6e72d3c8cc FIX Export of tags for contact and member 2015-06-01 21:34:21 +02:00
Laurent Destailleur
6af35e5cee Merge pull request #2822 from GPCsolutions/showbugtracklink 
NEW A link to the bugtracker can be enabled in the GUI
 2015-06-01 20:54:12 +02:00
Arnaud Aujon
9bd32d7bf6 Merge remote-tracking branch 'upstream/develop' into 3.7-webservices-fix 2015-06-01 20:10:51 +02:00
Laurent Destailleur
4f75ab79db Prepare 3.7.2 2015-06-01 16:32:33 +02:00
Laurent Destailleur
9ed5d817c4 Merge pull request #2936 from atm-gauthier/3.7 
FIX : When we automatically create an order from a proposal with workf…
 2015-06-01 16:15:37 +02:00
Laurent Destailleur
c9d63238ca Add fields at bank account description to manage corretly sepa 
generation.
 2015-06-01 13:19:02 +02:00
phf
0523f226cf FIX : when mailing is deleted, the targets list was kept in database 2015-06-01 12:29:10 +02:00
Gauthier
cf4308aa3b FIX : When we automatically creta an order from a proposal with workflow module, if some extrafields of propal don't exist in order object, insertExtraFields() function tries to insert extrafields in unexistant column of commande_extrafields table. 2015-06-01 11:24:30 +02:00
Raphaël Doursenaud
ecd5ebcb44 Member type ref is not deprecated 2015-06-01 11:10:52 +02:00
Raphaël Doursenaud
ea798c2315 Qual: deprecate dol_json_encode() and dol_json_decode() 
PHP > 5.3 supports json_encode() and json_decode() natively
 2015-06-01 11:00:11 +02:00
Raphaël Doursenaud
3f9270ea78 Qual: added deprecation hinting 
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
 2015-06-01 11:00:11 +02:00
Raphaël Doursenaud
a24e4fec6c NEW A link to the bugtracker can be enabled in the GUI 2015-06-01 10:46:56 +02:00
Laurent Destailleur
e9687cbc4f Fix the amount for entry price must use the format dedicated to amount. 2015-05-31 18:23:11 +02:00
Laurent Destailleur
523b04a315 Work on finishing 2015-05-31 17:31:15 +02:00
Laurent Destailleur
3588d73c8e Fix css 2015-05-31 16:36:11 +02:00
Laurent Destailleur
1b681510a5 NEW Use new select2 component for juridical status, country and state 
selection.
 2015-05-31 12:25:33 +02:00
Laurent Destailleur
19694710b2 Keep this constant visible 2015-05-31 12:24:23 +02:00
Laurent Destailleur
01aad8516d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/adherents/list.php
	htdocs/compta/dons/card.php
	htdocs/compta/dons/class/don.class.php
	htdocs/contact/list.php
	htdocs/contrat/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/security.lib.php
	htdocs/main.inc.php
	htdocs/product/stock/massstockmove.php
	htdocs/public/test/test_arrays.php
	htdocs/public/test/test_forms.php
	htdocs/societe/societe.php
 2015-05-31 03:30:38 +02:00
Laurent Destailleur
36de50f60d Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-05-31 03:07:36 +02:00
Laurent Destailleur
3cfe4dc86e Sync language files 2015-05-31 03:07:17 +02:00
Laurent Destailleur
7c4c096310 Fix typo 2015-05-31 02:33:03 +02:00
Laurent Destailleur
ceb2622181 Merge pull request #2934 from aspangaro/develop-patch24 
NEW: Add a button to purge criteria in user list
 2015-05-31 02:18:43 +02:00
Laurent Destailleur
487879ffd7 Merge pull request #2933 from bafbes/develop 
fix 600 first lines of arabic language admin file
 2015-05-31 02:15:52 +02:00
Laurent Destailleur
3690274375 Merge pull request #2930 from atm-ph/fix_issue_2901 
Fix issue 2901
 2015-05-31 02:09:40 +02:00
Laurent Destailleur
49f2157f2d Little debug of module resource 2015-05-31 02:05:39 +02:00
Laurent Destailleur
5e773d4cb6 Work on finishing of style 2015-05-31 01:06:51 +02:00
Laurent Destailleur
7a0ec2d831 Prototype with datatables works now also ith jmobile. 
Add field fifo and lifo into product table.
 2015-05-30 23:56:42 +02:00
aspangaro
fa2413f45a NEW: Add a button to purge criteria in user list 2015-05-30 21:01:37 +02:00
Laurent Destailleur
9b4ab63c7d Fix style 2015-05-30 20:07:44 +02:00
Laurent Destailleur
36b7f1dcf3 NEW Show photo of logged user into login top right block. 
NEW If no photo is available for user, we show a generic photo depending
on gender
 2015-05-30 19:50:07 +02:00
Laurent Destailleur
0b372a4017 Use a dedicated icon instead of generic one 2015-05-30 17:32:50 +02:00
Laurent Destailleur
bfe85cbf37 Better error management 2015-05-30 16:14:54 +02:00
Laurent Destailleur
7f352e5b24 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-30 15:21:56 +02:00
Laurent Destailleur
b14b1c1b12 Use dedicated picto 2015-05-30 15:21:48 +02:00
Laurent Destailleur
d9e8b6d977 Merge pull request #2921 from atm-gauthier/3.7 
FIX : when we create an agenda event with "Not applicable" status, it…
 2015-05-30 15:10:53 +02:00
Laurent Destailleur
03c06b3cf8 Merge pull request #2916 from aspangaro/develop-patch23 
FIX: export salaries & NEW: Add tab document on salaries payment
 2015-05-30 15:09:23 +02:00
Laurent Destailleur
5e486d798e Merge pull request #2915 from aspangaro/develop-ER 
ER add key language
 2015-05-30 15:09:00 +02:00
Laurent Destailleur
133893336b Merge pull request #2914 from aspangaro/develop-patch22 
Fix: Wrong language key
 2015-05-30 15:07:17 +02:00
Laurent Destailleur
a60ab7dd29 Merge pull request #2912 from atm-ph/fix_36_reassort_target 
FIX top links menu have target attribute with wrong value
 2015-05-30 15:06:46 +02:00
Laurent Destailleur
f5ec2c0605 Merge pull request #2911 from aspangaro/develop-md 
NEW Forms are using the tab look, even in creation mode
 2015-05-30 15:01:26 +02:00
Laurent Destailleur
07ae39fc38 Merge pull request #2910 from aspangaro/develop-patch21 
Fix: wrong link
 2015-05-30 15:00:30 +02:00
Laurent Destailleur
920dc80dd6 Merge pull request #2908 from defrance69/patch-63 
NEW Add hook for more action buttons on product supplier page
 2015-05-30 14:59:58 +02:00
Laurent Destailleur
13b78f9c17 NEW Add gender property managed on user card 
FIX Better error messages when uploading photo of user when permission
to write are not granted
 2015-05-30 02:17:05 +02:00
Laurent Destailleur
6701b399ae Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-30 00:26:47 +02:00
abb
1048bd1ba4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2015-05-29 22:11:00 +01:00
abb
3c8d37cb05 fix 600 first lines of arabic language admin file 2015-05-29 22:03:06 +01:00
Raphaël Doursenaud
bbd0b89087 Added tags/categories management to customers 
Customers part of #2571
 2015-05-29 18:50:43 +02:00
Raphaël Doursenaud
074fcd9769 Standardize categories types/ids management 
Fix #2922
Fix #2843
 2015-05-29 17:51:34 +02:00
Laurent Destailleur
2fb44caedb Merge pull request #2906 from atm-ph/fix_37_fetch_contact 
FIX : Compare array_options with oldcopy
 2015-05-29 17:41:38 +02:00
phf
9f52b9e800 FIX : #2901 2015-05-29 17:27:05 +02:00
Laurent Destailleur
888bec2df3 Merge pull request #2904 from fappels/develop 
FIX #2859 HTML units selector
 2015-05-29 17:21:32 +02:00
Laurent Destailleur
abcd7ae667 Merge pull request #2903 from atm-ph/fix_37_thirdparty_extrafield 
FIX : extrafields required on thirdparty
 2015-05-29 17:19:20 +02:00
Laurent Destailleur
0ab3cd03c0 Merge pull request #2896 from GPCsolutions/extrafieldcontacttype 
Allow usage of contact extrafield element type
 2015-05-29 17:18:25 +02:00
Laurent Destailleur
58dbfd38a9 Merge pull request #2926 from hregis/develop_origin 
Fix: possibility to shared facnumber between entities
 2015-05-29 17:16:02 +02:00
Laurent Destailleur
11552e90b7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-29 17:15:27 +02:00
phf
81b6655940 Merge branch '3.7' of https://github.com/Dolibarr/dolibarr into 3.7 2015-05-29 17:13:03 +02:00
Laurent Destailleur
65c7ab7a93 Fix: Introduce error by default when function is used as a true delete 
function.
 2015-05-29 17:11:42 +02:00
Laurent Destailleur
d925ecb4f1 Revert "Made test pessimistic by default" 2015-05-29 17:09:35 +02:00
Laurent Destailleur
eb62c7e462 Merge pull request #1446 from GPCsolutions/removefiles 
Made test pessimistic by default
 2015-05-29 16:56:28 +02:00
Regis Houssin
53fbab52f3 Merge remote-tracking branch 'dolibarr/develop' into develop_origin 2015-05-29 16:32:53 +02:00
jfefe
a618274760 Allow modify API key from user card 2015-05-29 16:05:52 +02:00
Alexis Algoud
dd7febe2b9 replace test by getEntity() 2015-05-29 15:10:59 +02:00
Alexis Algoud
ab0f805044 Merge branch '3.6' of https://github.com/Dolibarr/dolibarr into fix_multientity_num_check 2015-05-29 15:09:04 +02:00
Gauthier
a707d40251 FIX : when we create an agenda event with "Not applicable" status, it is automatically saved with "To do" status 2015-05-29 14:32:50 +02:00
Regis Houssin
c8c0f0f038 Fix: possibility to shared facnumber between entities 2015-05-29 11:31:51 +02:00
Regis Houssin
49fc7f9ba7 Fix: check the user status during authentication 2015-05-29 10:09:18 +02:00
Regis Houssin
131c3fcef8 Fix: check the user status during authentication 2015-05-29 10:07:48 +02:00
aspangaro
27c0b84a13 Typo on search 2015-05-29 06:54:16 +02:00
aspangaro
fd988ab1f3 Review card of supplier/customer ventilation 2015-05-29 06:43:40 +02:00
aspangaro
47045e0746 Accountancy: Review presentation 2015-05-28 21:34:35 +02:00
Arnaud Aujon
3003b41a88 add test for invoices API 2015-05-28 16:57:28 +02:00
Arnaud Aujon
05a7ab158b add deleteThirdParty api call + add tests 2015-05-28 16:56:45 +02:00
aspangaro
0bd07b795f NEW: Add tab document on salaries payment 2015-05-28 07:33:50 +02:00
aspangaro
d3513bf2a7 Fix: lot of typo to export salaries 2015-05-28 06:41:01 +02:00
aspangaro
58893a4576 Fix: problem of rights to export salaries 2015-05-28 06:26:28 +02:00
aspangaro
a8c49f11ca ER add key language 2015-05-28 06:16:58 +02:00
aspangaro
432cf998fa Fiche-rec: Forms are using the tab look, even in creation & add cancel button 2015-05-28 05:25:29 +02:00
aspangaro
33807c467d Fix: Wrong language key 2015-05-27 21:54:06 +02:00
Arnaud Aujon
278d447e45 Use Constant for status 2015-05-27 15:42:34 +02:00
phf
a676d3a0d1 Merge branch '3.6' into 3.7 2015-05-27 10:56:16 +02:00
phf
5a006d824e FIX : top links menu have target attribute with wrong value 2015-05-27 10:52:23 +02:00
aspangaro
8eee0bdf73 NEW Forms are using the tab look, even in creation mode 2015-05-27 07:41:25 +02:00
aspangaro
5f5388a52a Fix: wrong link 2015-05-27 07:19:10 +02:00
BENKE Charlie
d16bfcc294 adding hook for more action buttons 
allow additionnal hook action (like myField)
 2015-05-26 15:00:23 +02:00
phf
087b026f54 Add fetch extrafields in contact's fetch function 2015-05-26 12:40:49 +02:00
atm-ph
74c4db0f57 Remove comment 
This comment is false, my $_SESSION was wrong
 2015-05-26 11:23:25 +02:00
Francis Appels
b9c3dec141 Fix: issue #2859 unit form select 2015-05-26 11:14:15 +02:00
phf
3c0da7e2d7 FIX : extrafields required on thirdparty 2015-05-26 10:54:31 +02:00
Arnaud Aujon
23936827a8 Merge remote-tracking branch 'upstream/develop' into 3.7-webservices-fix 2015-05-26 10:54:30 +02:00
Laurent Destailleur
afd7366459 Css 2015-05-26 09:22:34 +02:00
Laurent Destailleur
bf334d8711 NEW Thumbs for statistics on main page are fully clicable (not only link 
inside the thumb)
 2015-05-26 09:13:48 +02:00
Laurent Destailleur
06faf762d4 Merge pull request #2865 from marcosgdf/bug-2843 
Closed bug #2843 Wrong SQL table called
 2015-05-25 19:34:33 +02:00
Laurent Destailleur
cb0b0fba7c Merge pull request #2897 from atm-ph/fix_37_create_contact 
FIX : create contact with extrafiel is null when it is require
 2015-05-25 19:28:17 +02:00
Laurent Destailleur
76380c2288 Merge pull request #2898 from defrance69/patch-62 
Tabs collector better identification
 2015-05-25 19:27:39 +02:00
Laurent Destailleur
0321257fbe Merge pull request #2887 from GPCsolutions/dolibarr-2886 
Deprecation of the mysql driver
 2015-05-25 18:50:40 +02:00
Laurent Destailleur
a4164a6656 Merge pull request #2883 from bafbes/develop 
Fix non existing "supplier invoice setting to draft" trigger
 2015-05-25 18:49:57 +02:00
Laurent Destailleur
c2decc8aea Merge pull request #2895 from atm-ph/fix_37_balise_script 
FIX : "script" balise with wrong syntax
 2015-05-25 18:49:15 +02:00
Laurent Destailleur
c8949d0532 Some doxygen fixes 2015-05-25 18:43:46 +02:00
BENKE Charlie
a30d4d4be6 Tabs collector better identification 
Tabs collector goes wrong with 2 tabs in the same page (like projet and task), so we use picto name to identify the 2 tabscollect
We need to substract the @ if the tabs is from a module... eg : factory@factory
 2015-05-25 18:14:49 +02:00
Laurent Destailleur
11d4a945b0 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/adherents/liste.php
	htdocs/comm/propal.php
	htdocs/compta/facture.php
	htdocs/contact/list.php
	htdocs/contrat/liste.php
	htdocs/product/liste.php
 2015-05-25 18:08:23 +02:00
Laurent Destailleur
a33809a526 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/adherents/liste.php
	htdocs/comm/propal.php
	htdocs/compta/facture.php
 2015-05-25 17:46:42 +02:00
phf
7b163d3b29 FIX : create contact with extrafiel is null when it is require 2015-05-25 17:36:36 +02:00
Raphaël Doursenaud
ec2035a73e Allow usage of contact extrafield element type 
As documented in the methods comments
 2015-05-25 17:19:27 +02:00
phf
33ad86261a FIX : width multiselect 2015-05-25 16:42:51 +02:00
phf
a5f2617166 FIX : "script" balise with wrong syntax 2015-05-25 15:52:41 +02:00
Marcos García de La Fuente
460a2ec2ab Merge branch 'develop' into commercial-name 
Conflicts:
	htdocs/categories/categorie.php
	htdocs/comm/prospect/list.php
 2015-05-25 15:09:46 +02:00
Marcos García de La Fuente
c0346bcba4 Fixed typo 2015-05-25 14:59:34 +02:00
Steve Braun
d1c7c9489e fixes #2847 2015-05-25 14:56:37 +02:00
Marcos García de La Fuente
8627f2f19b Removed innecesary test 2015-05-25 14:01:15 +02:00
Juanjo Menent
5ddcfce908 Merge pull request #2890 from GPCsolutions/categories-types 
Include Categories class whenever Categorie::TYPE is used
 2015-05-24 11:38:09 +02:00
Raphaël Doursenaud
becc240b92 Include Categories class whenever Categorie::TYPE is used 2015-05-23 23:35:49 +02:00
Raphaël Doursenaud
c018858e91 Deprecation of the mysql driver 
Fix #2886
 2015-05-23 20:43:21 +02:00
Juanjo Menent
55b7dab292 Merge pull request #2884 from GPCsolutions/categories-types 
Added types constants to categories
 2015-05-23 19:09:07 +02:00
Raphaël Doursenaud
ee808cdfd7 Added types constants to categories 2015-05-23 18:52:31 +02:00
Juanjo Menent
e9d58c06a2 Merge pull request #2882 from GPCsolutions/dolibarr-2881 
Make select_salesrepresentative() return 0 when empty
 2015-05-23 17:22:59 +02:00
Raphaël Doursenaud
139b41c014 Make select_salesrepresentative() return 0 when empty 
Fix #2881
 2015-05-23 16:38:59 +02:00
abb
ebf2edf019 added new trigger for supplier invoice unvalidation "BILL_SUPPLIER_UNVALIDATE" in set_draft class function 2015-05-23 15:35:19 +01:00
abb
879c82ee0a added new trigger for supplier invoice unvalidation "BILL_SUPPLIER_UNVALIDATE" in trigger demo file 2015-05-23 15:28:51 +01:00
abb
4e48f24507 added new trigger for supplier invoice unvalidation "BILL_SUPPLIER_UNVALIDATE" in Database 2015-05-23 15:12:24 +01:00
abb
ba68598ec7 added new trigger for supplier invoice unvalidation in Agenda 2015-05-23 15:09:44 +01:00
Raphaël Doursenaud
5fe31e90c8 Remove duplicate modify button on user's card 
Fix #2879
 2015-05-23 15:32:09 +02:00
Alexis Algoud
91885c9d6f FIX when multicompany was enabled, this function didn't check just on the good entity (problem when both company use same mask) 2015-05-22 17:22:57 +02:00
Laurent Destailleur
0b40502878 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2015-05-22 17:14:53 +02:00
Laurent Destailleur
dcc197eb6b Fix bug debian 786479 2015-05-22 17:13:32 +02:00
Laurent Destailleur
2f5d1f5965 Merge pull request #2842 from atm-alexis/fix_email_cc_in_selectlist_on_propal 
Fix email cc in selectlist on propal/bill
 2015-05-22 16:56:53 +02:00
Laurent Destailleur
4de46892d1 Merge pull request #2872 from atm-alexis/fix_button_create_payment_on_social_tax_less_than_1euro 
FIX button create payment hide if tax amount is less than 1
 2015-05-22 16:53:49 +02:00
phf
b9ed61eed4 FIX : update usergroup name 2015-05-22 16:46:28 +02:00
Laurent Destailleur
995a2c127d Working on finishing of look 2015-05-22 15:29:19 +02:00
Laurent Destailleur
390c7d8e65 Fix link to prospect with filter on commercial status 
Enhance natural_search method to allow to search on several ids.
 2015-05-22 15:19:27 +02:00
Laurent Destailleur
4319cd63a3 Working on finishing of look 2015-05-22 14:28:02 +02:00
Laurent Destailleur
97ba2cf0e9 Replace ol icon for delete with new one 2015-05-22 12:21:55 +02:00
Laurent Destailleur
6f5a30638c NEW On page to see/edit contact of an ojbect, the status of contact is 
visible (for both external and internal users).
 2015-05-22 12:21:36 +02:00
Maxime Kohlhaas
ff6708840d Fix : facturestats was not filtering on invoice type 2015-05-22 09:23:28 +02:00
Alexis Algoud
81a919e8a3 round to price2num 2015-05-22 09:05:38 +02:00
Laurent Destailleur
f35c41cc7e Introduce hidden option "MAIN_FIX_FLASH_ON_CHROME" to solve a strange 
behaviour of chrome making page to be flashed before rendered.
 2015-05-22 01:48:36 +02:00
Laurent Destailleur
6108dfad55 Minor enhancement 2015-05-22 00:46:53 +02:00
Laurent Destailleur
fb923c0c2b Merge pull request #2867 from aspangaro/develop-resource 
NEW Forms are using the tab look, even in creation mode
 2015-05-21 21:33:42 +02:00
Laurent Destailleur
3b70013cf9 Merge pull request #2871 from GPCsolutions/dolibarr-2870 
Dolibarr 2870
 2015-05-21 21:24:28 +02:00
Laurent Destailleur
a09563435b Merge pull request #2840 from FHenry/develop 
NEW : add date value filter on account records list
 2015-05-21 21:22:31 +02:00
Francis Appels
793f68dc96 Qual: Remove unused pages 
Remove unused but maintained pages which contain errors and deadlinks.
 2015-05-21 20:13:41 +02:00
maxime peyrot
bcb4754585 FIX #2856 : Wrong table design 2015-05-21 17:40:36 +02:00
Alexis Algoud
9184b08f94 FIX button create payment hide if tax amount is less than 1 2015-05-21 16:51:21 +02:00
Raphaël Doursenaud
fc88df9ddf Fixed typo 2015-05-21 16:33:38 +02:00
Raphaël Doursenaud
38a9f6edae Drop deprecated fields 
Fix #2870
 2015-05-21 16:32:46 +02:00
Arnaud Aujon
6d5555948e Merge remote-tracking branch 'upstream/develop' into 3.7-webservices-fix 
Conflicts:
	test/phpunit/WebservicesInvoicesTest.php
 2015-05-21 13:11:41 +02:00
Alexis Algoud
bc672c2c23 FIX event for restricted user was restricted if company null 2015-05-21 11:49:10 +02:00
Laurent Destailleur
e075fce5eb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-21 01:33:16 +02:00
Laurent Destailleur
90f9a845ae Enhance style 2015-05-21 01:32:56 +02:00
aspangaro
e23459d53b NEW Forms are using the tab look, even in creation mode 2015-05-20 21:50:38 +02:00
Raphaël Doursenaud
a7f6bbd316 Properly escape untrusted data to prevent HTML injection. 
First pass for #2857
 2015-05-20 17:34:00 +02:00
Marcos García de La Fuente
9ebae9520a Extrafields does not form part of this class 2015-05-20 16:46:12 +02:00
Marcos García de La Fuente
e24a8b4505 Closed bug #2843 Wrong SQL table called 2015-05-20 16:43:44 +02:00
Laurent Destailleur
f0cfa3406c Merge pull request #2852 from aspangaro/develop-resource 
NEW Forms are using the tab look, even in creation mode
 2015-05-20 15:27:08 +02:00
Laurent Destailleur
0f89164f4f Merge pull request #2849 from aspangaro/develop-ER_listlimit 
Fix: ER list don't respect $conf->liste_limit
 2015-05-20 15:26:34 +02:00
Laurent Destailleur
a49c6bce66 Merge pull request #2844 from tysauron/patch-3 
For backward compatibility ON update actioncomm
 2015-05-20 15:24:32 +02:00
Laurent Destailleur
4d35939d77 Merge pull request #2850 from aspangaro/develop-adherent 
Members: Review (Add background in create mode / Add button cancel / move type tab in member.lib)
 2015-05-20 15:24:09 +02:00
Laurent Destailleur
55b9d97081 Fix PHPCS 2015-05-20 15:22:59 +02:00
Laurent Destailleur
a05510c9df Merge pull request #2845 from tysauron/patch-2 
Bug : Declaration of CompanyBankAccount::create() should be compatibl…
 2015-05-20 15:19:42 +02:00
Laurent Destailleur
0e837f7540 Merge pull request #2848 from aspangaro/develop-md 
Add pagination style in every template
 2015-05-20 15:18:44 +02:00
Florian HENRY
0331ddc2de fix spacing 2015-05-20 11:30:27 +02:00
Florian HENRY
df4ee9562f fix spell 2015-05-20 11:29:35 +02:00
Florian HENRY
8fa3b8dac3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-20 11:24:49 +02:00
Florian HENRY
6e6b66e416 apply recommandation from 
ca53d3b602 (commitcomment-11245627)
 2015-05-20 11:24:23 +02:00
aspangaro
58e942681d NEW Forms are using the tab look, even in creation mode 2015-05-20 07:03:17 +02:00
aspangaro
b9bed14afe Fix: spaces &nbsp; 2015-05-20 06:38:36 +02:00
aspangaro
de5a15282c Adherent review 2015-05-20 06:25:43 +02:00
aspangaro
124dbbc2f2 Members: Add background in create mode in type adherent 2015-05-19 22:36:35 +02:00
aspangaro
40b65a642d Fix: ER list don't respect $conf->liste_limit 2015-05-19 22:22:18 +02:00
Laurent Destailleur
26a74ba3cc Add constant to allow a module to disable injection scan for its pages. 2015-05-19 22:08:51 +02:00
aspangaro
63b0dbd47b Add pagination style in every template 2015-05-19 21:59:44 +02:00
Francis Appels
40ef5737fc Fix: SQL error in facturestats on no view rights 
table alias sc must be available when user has no rights to view
customers. see where defenition line 80
 2015-05-19 16:34:21 +02:00
tysauron
572269bed1 For backward compatibility ON update actioncomm 
For backward compatibility when val=id   ON update actioncomm object
 2015-05-19 15:54:08 +02:00
Florian HENRY
ee1aa3268c working account 2015-05-19 11:55:45 +02:00
tysauron
d29aa083cf Bug : Declaration of CompanyBankAccount::create() should be compatible with Account::create($user = '') 2015-05-19 11:30:14 +02:00
Laurent Destailleur
62e1c55c97 NEW Introduce function dolGetFirstLineOfText 2015-05-19 00:44:05 +02:00
Laurent Destailleur
03acb1a8c9 Uniformize way to report error after "buildoc" action. 2015-05-19 00:01:30 +02:00
Laurent Destailleur
e2280ce93e NEW Can close a project that has draft status with no need to switch it 
to validate status before.
 2015-05-18 23:49:08 +02:00
Laurent Destailleur
4a70bb7acf Work on generic usage of get_exdir. 2015-05-18 23:04:49 +02:00
Laurent Destailleur
15c355efc9 A ref field must never be null. 2015-05-18 22:31:14 +02:00
Laurent Destailleur
a258370f8a Prepare code for generic solution where all path are forged using 
get_exdir.
 2015-05-18 22:25:51 +02:00
Laurent Destailleur
4d6b25eb45 Prepare to generalize usage of get_exdir 2015-05-18 21:47:44 +02:00
Laurent Destailleur
6d03ba228d Fix consistency of backup result message 2015-05-18 20:33:02 +02:00
Laurent Destailleur
e230d72cea Increase default date range to current month instead of current day 2015-05-18 19:41:23 +02:00
Laurent Destailleur
36cad55ed7 Merge pull request #2829 from bafbes/patch-6 
NEW Add date filtering into audit page
 2015-05-18 19:25:30 +02:00
Francis Appels
28e973331b Fix: update supplier orderline + rm deprecated prop 
- Fix SQL error in update supplier orderline
- Remove deprecated $libelle from product class, $libelle is removed
from code and can not be used anymore, no sense to mark deprecated.
- Add missing translation key
 2015-05-18 18:42:14 +02:00
Alexis Algoud
a4031a3680 if contact in sellist, it's an Id 2015-05-18 18:33:17 +02:00
Florian HENRY
3ef38ab959 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-18 13:14:04 +02:00
Florian HENRY
23eac58cc8 fix bug on new feature checkbox list form table 2015-05-18 13:13:50 +02:00
Florian HENRY
a6c5a247cd add total and title in page records banck account 2015-05-18 11:08:27 +02:00
Laurent Destailleur
7d51779610 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-18 11:01:19 +02:00
Laurent Destailleur
e561481f1e Add option THIRDPARTY_NOTCUSTOMERPROSPECT_BY_DEFAULT and 
THIRDPARTY_NOTCUSTOMERPROSPECT_BY_DEFAULT
 2015-05-18 10:58:04 +02:00
Florian HENRY
ca53d3b602 NEW : add date value filter on account records list 2015-05-18 10:43:54 +02:00
Laurent Destailleur
756de27a12 Fix syntax error 2015-05-18 09:11:34 +02:00
Laurent Destailleur
684686e0f6 Fix restore compatibility of new navigation style with jmobile 2015-05-18 08:59:58 +02:00
Laurent Destailleur
f0a1b7984f More complete test pages 2015-05-18 08:59:25 +02:00
Laurent Destailleur
d25a2af70c Fix PHPCS 2015-05-17 23:47:15 +02:00
Laurent Destailleur
36d164f779 Add field gender into table of user. 2015-05-17 23:43:57 +02:00
Laurent Destailleur
851007f1a8 Prepare database to manage recurring events 2015-05-17 20:12:49 +02:00
Laurent Destailleur
c89c883d7d Fix the new navigation style. 2015-05-17 19:37:37 +02:00
Laurent Destailleur
372ad4924b Add print_barre_liste into prototype. 2015-05-17 18:34:52 +02:00
Bahfir Abbes
1ba2240553 fix add to listevents.php 
use of dol_mktime + check dates order
 2015-05-17 16:13:50 +01: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
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
Juanjo Menent
1d3bcc1d81 Insert option to use old system storage photos only if the first 
installation was done with a version < 3.7.0

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2015-05-16 16:19:51 +02:00
Laurent Destailleur
1d8a3809f0 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2015-05-16 15:27:18 +02:00
Laurent Destailleur
80943111cc Prepare 3.5.7 2015-05-16 15:26:34 +02:00
Laurent Destailleur
ad7c4a2b52 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-05-16 14:00:09 +02:00
Laurent Destailleur
0e1cf72c43 Fix bad order for firstname, lasname 2015-05-16 13:59:48 +02:00
Laurent Destailleur
4b13d5fafe Fix css 2015-05-16 03:11:08 +02:00
Laurent Destailleur
58b70f0503 Better translation 2015-05-16 03:07:29 +02:00
Laurent Destailleur
213c918a90 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-16 02:53:56 +02:00
Laurent Destailleur
1b03e348d3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/compta/bank/annuel.php
 2015-05-16 02:53:36 +02:00