Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
49,272 Commits 36 Branches 189 Tags
b57c156b60c19dfd75e15bd548a649d31e6bdc7d
Commit Graph

61 Commits

Author SHA1 Message Date
Laurent Destailleur
099e3f0376 FIX Removed warnings 2015-09-17 00:47:56 +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
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
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
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
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
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
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
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
40d17add22 Fix missing print 2015-06-20 19:42:07 +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
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
Laurent Destailleur
5e773d4cb6 Work on finishing of style 2015-05-31 01:06:51 +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
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
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
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
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
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
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
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
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
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