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
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
Laurent Destailleur
312281f4d4
Debug askpricesupplier
...
Try to continue work on position of menu entries.
2015-07-02 22:43:51 +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
b6efa5ed11
NEW Can upload files on leave requests. Use more standard permissions.
2015-06-27 11:45:23 +02:00
Laurent Destailleur
c218843cdb
FIX Save of filters into export profiles failed.
2015-06-24 18:29:29 +02:00
Florian HENRY
daab394c81
add extrafields into import product
2015-06-24 12:40:56 +02:00
Laurent Destailleur
0780c84012
Fix missing payment mode into export invoice profile
2015-06-23 23:58:04 +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
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
20582b9ea5
Merge remote-tracking branch 'Upstream/develop' into develop-36
2015-06-21 07:31:43 +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
aspangaro
0ff97da1ea
Review ER : remove fk_c_tva and add option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT
2015-06-20 09:06:20 +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
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
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
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
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
Laurent Destailleur
8d84dd1155
Uniformize code
2015-06-06 14:34:57 +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
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
df60754e52
Merge pull request #2708 from GPCsolutions/deprecated
...
Deprecated
2015-06-05 15:44:08 +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
Laurent Destailleur
4adeb8980d
NEW Add ref and label of project into export
2015-06-03 16:40:02 +02:00
aspangaro
bde91633da
Fix: input of french article is disabled by default
2015-06-03 06:01:05 +02:00
Laurent Destailleur
6e72d3c8cc
FIX Export of tags for contact and member
2015-06-01 21:34:21 +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
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
49f2157f2d
Little debug of module resource
2015-05-31 02:05:39 +02:00
Laurent Destailleur
0b372a4017
Use a dedicated icon instead of generic one
2015-05-30 17:32:50 +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
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
Regis Houssin
c8c0f0f038
Fix: possibility to shared facnumber between entities
2015-05-29 11:31:51 +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
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
abb
ba68598ec7
added new trigger for supplier invoice unvalidation in Agenda
2015-05-23 15:09:44 +01:00
Laurent Destailleur
4a70bb7acf
Work on generic usage of get_exdir.
2015-05-18 23:04:49 +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
Florian HENRY
f29d8aed5b
Fix problem with multicompany on new feature Product propal merge PDF
...
product
2015-05-15 17:39:28 +02:00
Marcos García de La Fuente
e2b2c1c8bd
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/societe/class/societe.class.php
2015-05-15 12:30:03 +02:00
Marcos García de La Fuente
457918c0f7
Merge remote-tracking branch 'upstream/develop' into commercial-name
2015-05-15 11:17:21 +02:00
