Commit Graph

1474 Commits

Author SHA1 Message Date
Laurent Destailleur
9da0164d90 Uniformize code for lists 2016-02-07 15:50:48 +01:00
Laurent Destailleur
84f4f2d40f FIX The search on user/group was not using new code. Fiels used for
search was not visible.
2016-02-07 02:55:56 +01:00
Laurent Destailleur
7c96194750 NEW Hidden option MAIN_LANDING_PAGE to choose the first page to show
after login works as a "global" option (llx_const) and as a "per user"
option (llx_user_param).
2016-01-24 17:40:07 +01:00
Laurent Destailleur
4df584e57b Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/core/lib/files.lib.php
2016-01-23 11:51:56 +01:00
Laurent Destailleur
dbaa43f3be Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/holiday/card.php
	htdocs/holiday/list.php
	htdocs/user/card.php
2016-01-23 11:45:39 +01:00
Laurent Destailleur
dadc24462a Fix: We must ue the "small" size of imge to show on card pages. 2016-01-22 14:14:39 +01:00
Laurent Destailleur
49a325e7ae Fix: We must ue the "small" size of imge to show on card pages. 2016-01-22 14:10:27 +01:00
Laurent Destailleur
50b0019ead A protection to avoid situation loosing all admin accounts 2016-01-22 11:54:14 +01:00
Laurent Destailleur
45363cbf4c Save space on user card so groups are more visible 2016-01-21 16:10:20 +01:00
aspangaro
87f1e55bcb Fix: SQL error on user bank tab 2016-01-10 07:08:49 +01:00
Laurent Destailleur
06c97b931b Fix css 2016-01-09 00:06:16 +01:00
Laurent Destailleur
1e1d6d4955 Fix to be able to use dolibarr with a smartphone 2016-01-03 19:34:19 +01:00
Laurent Destailleur
52cd5d505e Fix several bugs on css, translation or look 2016-01-01 23:44:23 +01:00
philippe grand
1eeee203d7 [Qual] comments should be in english 2015-12-22 09:37:27 +01:00
philippe grand
c740a85006 [Qual] Uniformize code 2015-12-21 14:43:21 +01:00
Laurent Destailleur
b179a193dd Fix param for username is $username and not $login 2015-12-21 03:01:37 +01:00
philippe grand
2cd49043a6 [Qual] Close database handler should be after Footer 2015-12-11 19:37:12 +01:00
Raphaël Doursenaud
4f359616ce [Security] Hide click to dial password 2015-12-09 18:16:08 +01:00
Laurent Destailleur
745875d21e NEW Can choose fields to show on project list 2015-12-06 01:19:27 +01:00
Laurent Destailleur
374480043e Add maxwidth300 on combo list for users and sale representatives 2015-12-06 00:37:58 +01:00
Laurent Destailleur
497c30d994 NEW Add thumb of users into thumbs stats on home page 2015-12-05 19:38:45 +01:00
Laurent Destailleur
9d3451b31d NEW Add thumb of users into thumbs stats on home page 2015-12-05 19:31:32 +01:00
aspangaro
c30728326e Merge remote-tracking branch 'Upstream/develop' into develop-bank 2015-12-04 12:41:51 +01:00
aspangaro
e1c8e6d8f6 Remove useless code 2015-12-01 20:27:29 +01:00
aspangaro
882b66c586 HRM - Add bank tab in user to pay salary or expense report 2015-12-01 06:56:26 +01:00
Laurent Destailleur
de730c9762 NEW Introduce cost price on product. 2015-11-30 21:20:45 +01:00
Laurent Destailleur
fcdb3af708 Merge pull request #4106 from aspangaro/develop-skype
New: Better integration of skype for dolibarr 3.9
2015-11-28 16:31:35 +01:00
aspangaro
d12e3ca91f Finish work on better integration of skype 2015-11-28 14:43:16 +01:00
Laurent Destailleur
88e76dcf64 Fix utf8 encoded twice 2015-11-28 14:40:23 +01:00
Raphaël Doursenaud
231196437c Fix #4074 Properly save user theme settings 2015-11-23 14:21:25 +01:00
Laurent Destailleur
3f87b30327 Use same way to obfuscate key than password 2015-11-22 14:21:12 +01:00
Laurent Destailleur
97dc4c346b Merge pull request #4026 from aspangaro/develop-hrm
New: FR #3699 HRM Add address informations in user card
2015-11-21 00:27:29 +01:00
aspangaro
98d5f21787 Debug state 2015-11-19 06:21:37 +01:00
aspangaro
1e4d8ec104 New: HRM #3699 Add address informations in user card 2015-11-18 06:34:08 +01:00
aspangaro
ad457b416d Use menu & add mode 'employee' in user/index.php 2015-11-17 22:51:34 +01:00
aspangaro
c7df6c15a2 Different display if employee mode 2015-11-17 21:22:45 +01:00
Laurent Destailleur
6bd6be0912 Debug and rename experimental module "supplier proposal". Still work to
do: Must fix the PDF to be compliant with a request quotation to a
supplier (so no need to show vat, unit price, ...).
2015-11-15 19:23:39 +01:00
Laurent Destailleur
64c783623b NEW Framework feature. To have a page being loaded at same scrollbar
level wafter a click on a href link, just add the class "reposition" on
this link.
2015-11-13 03:35:55 +01:00
Laurent Destailleur
59a79442b0 Enhance code for select field list feature.
Add gender and employee on user list.
2015-11-11 17:05:18 +01:00
Laurent Destailleur
13a0fa2c69 Missing css 2015-11-10 15:50:13 +01:00
Laurent Destailleur
d2fa580f5d The code generator can generate a list.php page with all feature
immediatly working (sort, extrafields, hooks, select fields to show...)
2015-11-05 13:43:22 +01:00
Laurent Destailleur
f15425be52 Include the link "Back to list" on banner of all user tabs. 2015-11-04 15:45:35 +01:00
Laurent Destailleur
3726b127a1 Remove duplicated code or useless code 2015-11-04 14:44:11 +01:00
Laurent Destailleur
0d4c5c4452 Fix missing $db->jdate 2015-11-03 15:33:45 +01:00
Laurent Destailleur
3760f247a2 NEW Can now select fields to show in product list. Extrafields are also
supported.
2015-10-30 00:05:00 +01:00
Laurent Destailleur
5c4ac0bf62 NEW Merge all left menu search boxes into one. 2015-10-26 12:18:22 +01:00
Laurent Destailleur
9a4b62c279 NEW Introduce use of cache for thumbs images of users 2015-10-25 20:15:52 +01:00
Laurent Destailleur
24732cf454 Fix to avoid duplicate tooltip 2015-10-25 20:01:39 +01:00
Laurent Destailleur
d7761ece58 FIX The thumb of user into top menu was using the image in full size.
This make a large download at each page call. We must use the mini
thumbs.
2015-10-25 19:42:54 +01:00
Laurent Destailleur
48ed8d4408 FIX The thumb of user into top menu was using the image in full size.
This make a large download at each page call. We must use the mini
thumbs.
2015-10-25 19:42:00 +01:00
Laurent Destailleur
b49d63c12f NEW Show photo of user into user list. A new function
getImageFileNameForSize was also introduced to choose image best size
according to usage to save bandwith.
2015-10-25 19:31:42 +01:00
Laurent Destailleur
1261ad43a1 NEW Can select which field to show into list of users. 2015-10-25 18:15:37 +01:00
Laurent Destailleur
1b8234d9fe Bette behaviour for blind people 2015-10-25 11:09:50 +01:00
Laurent Destailleur
461771d488 Currency is on title only. 2015-10-24 21:20:32 +02:00
Laurent Destailleur
b88a28b660 Restore compatibility with old version 2015-10-24 19:45:41 +02:00
Laurent Destailleur
43c80bec7d A better responsive menu for very small screen 2015-10-24 13:52:35 +02:00
Laurent Destailleur
016dbd39ee Fix sql phpunit regression 2015-10-23 15:24:47 +02:00
Sergio Sanchis Climent
2a412af00b Fix: Bug: if $this->employe no exist
Fix: if this->employee no exist default 0
2015-10-23 13:04:33 +02:00
Laurent Destailleur
8df59134a9 Merge pull request #3705 from aspangaro/develop-hrm
New : Module HRM
2015-10-22 19:15:49 +02:00
Laurent Destailleur
77c43ebb26 FIX #3558 2015-10-22 14:08:19 +02:00
Laurent Destailleur
5db82b8869 Merge pull request #3743 from hregis/develop_origin
Fix: Parse error: syntax error, unexpected '}'
2015-10-17 10:37:03 +02:00
aspangaro
aac88519de Merge remote-tracking branch 'Upstream/develop' into develop-hrm
Conflicts:
	htdocs/user/card.php
2015-10-17 07:19:46 +02:00
Laurent Destailleur
b3491ef4e5 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	ChangeLog
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/admin/facture_cust_extrafields.php
	htdocs/compta/facture/admin/facturedet_cust_extrafields.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
2015-10-16 10:12:36 +02:00
Regis Houssin
d44e961014 Fix: Parse error: syntax error, unexpected '}'
Fix: bad indentation !!! use tabulation instead spaces please !!!
2015-10-15 16:35:05 +02:00
Regis Houssin
39d89ef9aa Fix: Parse error: syntax error, unexpected '}' 2015-10-15 16:11:03 +02:00
Marcos García de La Fuente
87ad6e7941 Merge branch 'develop' into doactions-usercard
# Conflicts:
#	htdocs/user/agenda_extsites.php
2015-10-13 09:49:19 +02:00
aspangaro
0b54cc4509 Merge remote-tracking branch 'Upstream/develop' into develop-hrm 2015-10-11 21:05:15 +02:00
Laurent Destailleur
3bb8eac92b New banner tab is available on all tab of user object 2015-10-11 16:25:31 +02:00
Laurent Destailleur
b24d609ecc New banner tab is available on all tab of user object 2015-10-11 16:12:12 +02:00
Laurent Destailleur
bd48ad265d The new banner tab is also on user card now 2015-10-11 15:21:21 +02:00
Marcos García de La Fuente
1cd0f7263f Merge remote-tracking branch 'upstream/develop' into doactions-usercard
# Conflicts:
#	htdocs/user/card.php
#	htdocs/user/param_ihm.php
2015-10-10 22:38:02 +02:00
Marcos García de La Fuente
3fd626705f NEW Added doActions hooks to user cards
Close #3394
2015-10-10 22:31:01 +02:00
aspangaro
b571cc86ff Add a yn form in user card to know if the user is also an employee 2015-10-09 07:30:48 +02:00
Laurent Destailleur
9f2bcf0e4f FIX The admin flag is mising. 2015-10-05 23:53:49 +02:00
Laurent Destailleur
7b2fbdd638 FIX Can't change the admin with default setup 2015-10-05 10:04:34 +02:00
frederic34
1e8ff69267 Optioncss 2015-10-04 13:34:55 +02:00
frederic34
9a021e6de4 Optioncss not kept in list 2015-10-04 10:45:57 +02:00
Juanjo Menent
7bc6f14736 Merge pull request #3608 from All-3kcis/develop-patch-7
fix dangerous sql injection
2015-10-03 23:16:04 +02:00
All-3kcis
e17b3529ab Correct error 2015-09-26 15:12:32 +02:00
Laurent Destailleur
62792c08eb Merge pull request #3591 from GPCsolutions/inherited
[Qual] Cleanup of inherited class properties
2015-09-26 11:23:59 +02:00
Juanjo Menent
6999ad0a4f Merge pull request #3587 from GPCsolutions/fiche_titre
[Qual] Replaced deprecated function calls.
2015-09-26 08:39:22 +02:00
All-3kcis
2a84afeee4 fix dangerous sql injection #3327 2015-09-25 16:31:55 +02:00
Raphaël Doursenaud
67ddb6c94e [Qual] Cleanup of inherited class properties 2015-09-24 20:12:55 +02:00
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
Raphaël Doursenaud
dabfad1529 [Qual] Replaced deprecated print_titre() 2015-09-24 18:27:13 +02:00
Raphaël Doursenaud
9f2545b95d [Qual] Replaced deprecated dol_clone by native clone 2015-09-24 17:24:40 +02:00
Laurent Destailleur
23f6464999 Work on CSS 2015-09-22 01:25:06 +02:00
Laurent Destailleur
58a734cb17 Firstname only on login 2015-09-21 17:28:11 +02:00
Laurent Destailleur
8332609d06 Merge pull request #3539 from All-3kcis/develop-patch-6
FIX  #3524
2015-09-18 20:49:27 +02:00
Laurent Destailleur
27b1f2ecc6 Merge remote-tracking branch 'origin/3.8' into develop 2015-09-17 19:52:13 +02:00
All-3kcis
31266b3c11 FIX #3524
(Fatal error: Call to undefined function getRandomPassword() in /htdocs/user/card.php on line 846)
2015-09-17 10:00:32 +02:00
Laurent Destailleur
099e3f0376 FIX Removed warnings 2015-09-17 00:47:56 +02:00
Laurent Destailleur
9cbd236c8c Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/filefunc.inc.php
2015-09-16 22:09:21 +02:00
Laurent Destailleur
7f60abdf7b FIX #3524 2015-09-16 21:05:02 +02:00
Laurent Destailleur
a5c6582bc1 Fix duplicate translation/encoding on setEventMessage
Conflicts:
	htdocs/ftp/index.php
2015-09-12 12:55:20 +02:00
Laurent Destailleur
c785f8cfb1 Fix duplicate translation/encoding on setEventMessage 2015-09-12 12:52:07 +02:00
Laurent Destailleur
3c91b8c890 Force to select "use personalized value" to select a personalized screen
option.
2015-09-09 12:39:06 +02:00
Laurent Destailleur
5ffab9720f More complete connexion profile 2015-09-07 12:38:39 +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
18f064cc69 Fix login is a mandatory field. 2015-08-20 15:18:36 +02:00
Laurent Destailleur
923203802c fix dangerous sql injection #3327 2015-08-12 23:33:09 +02:00
Laurent Destailleur
f1e87478ff Fix translation of printing menu 2015-08-12 23:12:15 +02:00
Juanjo Menent
e1f627ca8e Merge remote-tracking branch 'origin/3.7' into 3.8 2015-08-10 20:37:44 +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
Laurent Destailleur
747e4b5e40 Fix timezone problem with external calendar import. 2015-07-28 18:12:45 +02:00
Laurent Destailleur
9451296f6b Fix: Missing tooltip 2015-07-28 12:11:39 +02:00
All-3kcis
d3f283a8d9 Correct api_key and error "DB_ERROR_RECORD_ALREADY_EXISTS" 2015-07-21 11:43:23 +02:00
Laurent Destailleur
2df2e8b44e Merge remote-tracking branch 'origin/3.8' into develop 2015-07-20 00:55:30 +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
b59b7785ee Fix error management 2015-07-19 16:00:12 +02:00
Laurent Destailleur
cb98d6cb93 Merge remote-tracking branch 'origin/3.8' into develop 2015-07-19 15:32:20 +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
aspangaro
d9dd9ff688 Merge remote-tracking branch 'Upstream/3.8' into 3.8-1 2015-07-16 12:25:37 +02:00
aspangaro
59e88590e0 Move my address email to new one 2015-07-15 20:30:33 +02:00
Regis Houssin
6f1645f2f2 Fix: check if $mc object exists 2015-07-13 10:14:04 +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
8eb4a208ce Debug statistics of project module 2015-07-05 22:04:30 +02:00
Laurent Destailleur
089056f024 Filter on status on hierarchical view 2015-07-05 12:15:21 +02:00
Laurent Destailleur
4a1dfa60a5 Uniformize code 2015-06-30 13:14:19 +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
5584acddbd Content of popup tooltip on contact and login link 2015-06-26 17:21:03 +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
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
ef5ff2f218 Use the complete popup on user in user list and hierarchy view. 2015-06-16 15:08:20 +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
Laurent Destailleur
d5c26af563 Missing nohover css 2015-06-13 20:26:49 +02:00
Regis Houssin
c21156dd13 Fix: strict mode hunter 2015-06-10 18:58:42 +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
Laurent Destailleur
df60754e52 Merge pull request #2708 from GPCsolutions/deprecated
Deprecated
2015-06-05 15:44:08 +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
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
523b04a315 Work on finishing 2015-05-31 17:31:15 +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
5e773d4cb6 Work on finishing of style 2015-05-31 01:06:51 +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
bfe85cbf37 Better error management 2015-05-30 16:14:54 +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
jfefe
a618274760 Allow modify API key from user card 2015-05-29 16:05:52 +02:00
Raphaël Doursenaud
5fe31e90c8 Remove duplicate modify button on user's card
Fix #2879
2015-05-23 15:32:09 +02:00
phf
b9ed61eed4 FIX : update usergroup name 2015-05-22 16:46:28 +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
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
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
0e1cf72c43 Fix bad order for firstname, lasname 2015-05-16 13:59:48 +02:00
Laurent Destailleur
c33cbefad2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-15 11:16:29 +02:00
Laurent Destailleur
bf883e1576 Minor cosmetic changes
Fix permissions and CRLF
2015-05-15 02:34:57 +02:00
Laurent Destailleur
b327b5fb9d Save regressions 2015-05-13 09:32:54 +02:00
Laurent Destailleur
8e09f54a46 Minor fixes 2015-05-13 07:46:12 +02:00
Laurent Destailleur
b0d73ee674 FIX Bad link to login page into email for password renewal. 2015-05-12 23:47:28 +02:00
Raphaël Doursenaud
932e23ac09 [Qual] Use jQuery 'is' instead of 'prop' in conditions 2015-05-12 16:21:21 +02:00
Raphaël Doursenaud
e149d49fb8 [Qual] Use jQuery property instead of attribute to test and set disabled 2015-05-12 14:53:01 +02:00
Raphaël Doursenaud
0d8641a073 [Qual] Use jQuery property instead of attribute to test and set checked 2015-05-12 14:51:30 +02:00
Laurent Destailleur
83e4fe5d95 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/fourn/facture/list.php
2015-05-12 00:09:03 +02:00
Laurent Destailleur
c2b31a37ba Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/contrat/fiche.php
	htdocs/core/modules/expedition/modules_expedition.php
	htdocs/expedition/class/expedition.class.php
	htdocs/expedition/fiche.php
	htdocs/user/fiche.php
2015-05-11 23:53:38 +02:00
Raphaël Doursenaud
b8d9c20731 [Qual] Fixed HTML input form disabled attribute
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form disabled attribute should not have a value.
2015-05-07 14:21:14 +02:00
Laurent Destailleur
ac4bd7d441 Uniformize code 2015-05-04 11:41:30 +02:00
Laurent Destailleur
b554d81314 Better translation 2015-05-04 10:47:26 +02:00
Laurent Destailleur
43efd76b24 Fix remove warnings 2015-04-29 23:39:34 +02:00
Laurent Destailleur
290856db1c Fix remove warning 2015-04-29 22:37:04 +02:00
jfefe
c905f88498 Change generic and setup image title 2015-04-18 23:13:48 +02:00
Marcos García de La Fuente
e2e6049c7f Copyright 2015-04-18 20:50:03 +02:00
Marcos García de La Fuente
dc790ff586 NEW: Feature request: A page to merge two thirdparties into one #2613 2015-04-18 20:41:09 +02:00
Laurent Destailleur
56a14da5d4 FIXME that are not bug are replaced with TODO
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
2015-04-12 04:01:28 +02:00
Laurent Destailleur
d944c3bf17 Code cleaner when we are using multicompany 2015-04-10 11:40:24 +02:00
Laurent Destailleur
f0fb6f1b2c Work on md theme 2015-03-24 22:24:15 +01:00
Laurent Destailleur
3844d4e6f7 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	ChangeLog
	htdocs/core/boxes/box_activity.php
	htdocs/fourn/commande/card.php
	htdocs/user/card.php
2015-03-23 15:16:37 +01:00
Laurent Destailleur
7ad0a32559 Fix for multicompany users. 2015-03-23 04:51:24 +01:00
Laurent Destailleur
042556a9cf Better comments 2015-03-23 03:50:55 +01:00
Laurent Destailleur
f4b1d95b3e Some fix for multicompany module 2015-03-23 02:39:41 +01:00
Laurent Destailleur
49824a0e56 Method colorStringToArray can accept the #
Method monthArray can return short label of month
2015-03-22 18:17:25 +01:00
Scrutinizer Auto-Fixer
b693ed3f51 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-03-16 23:21:17 +00:00
aspangaro
d69f066735 QUAL: Traduce terms + remove <center> 2015-03-15 14:04:07 +01:00
Laurent Destailleur
84695845bb Some fixes into translation and permissions 2015-03-09 21:20:56 +01:00
Laurent Destailleur
d119397129 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/societe/class/societe.class.php
2015-03-05 11:38:16 +01:00
Laurent Destailleur
b888a04af9 Reduce a lot of duplicate code. Move all tables of extrafields setup
into a tpl file.
2015-02-28 20:14:26 +01:00
Laurent Destailleur
ef14e4e7ed Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.product.class.php
2015-02-28 03:11:15 +01:00
aspangaro
8f388aaa9b Merge remote-tracking branch 'Upstream/3.7' into 3.7-patch4 2015-02-26 20:48:21 +01:00
aspangaro
47c41f6a85 Add a test to enable field only when module salary is used 2015-02-26 20:47:06 +01:00
Laurent Destailleur
4bde7e9f51 Fix: Missing error management 2015-02-26 14:25:30 +01:00
Laurent Destailleur
94a5f87bd8 comment 2015-02-23 15:13:14 +01:00
Laurent Destailleur
6d3834b3b9 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/index.php
	htdocs/projet/class/project.class.php
	test/phpunit/BankAccountTest.php
2015-02-23 14:59:24 +01:00
Laurent Destailleur
d3a79c8724 Fix default entity guess 2015-02-23 14:44:24 +01:00
aspangaro
067af47955 Add accountancy field on creation mode and correct rowspan. 2015-02-22 08:35:25 +01:00
aspangaro
4bb524d55d Also for edit user. 2015-02-22 08:12:40 +01:00
aspangaro
ce247432ee FIXED: Remove condition to show accountancy field on user. 2015-02-22 08:05:23 +01:00
Laurent Destailleur
6d1324b463 Work on expense report module 2015-02-21 16:15:54 +01:00
Laurent Destailleur
91626cfc92 Merge pull request #2316 from mrsof/develop
FIX : Update action return PHP Fatal error: Using $this when not in object context
2015-02-03 13:44:17 +01:00
Sof
493732bdc3 Update action returnb PHP Fatal error: Using $this when not in object context 2015-02-03 10:45:00 +01:00
Laurent Destailleur
968b2b433b Better position for username 2015-02-01 01:43:19 +01:00
Laurent Destailleur
52222ecdfe Avoid tooltip into tooltip 2015-02-01 01:28:15 +01:00
Laurent Destailleur
1e38227c2d Reduce number of new to save memory usage.
Fight table to replace with div
2015-02-01 00:54:26 +01:00
frederic34
c1943f989b Tooltip 2015-01-31 10:58:03 +01:00