lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
54,947 Commits 43 Branches 150 Tags 886 MiB
9ca7f2cb66
Commit Graph

54947 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
9ca7f2cb66 Better support for option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN (on by 
default).
 2016-07-28 19:02:23 +02:00
Laurent Destailleur
00118610bb A fix to make editinplace working better 2016-07-28 15:29:46 +02:00
Laurent Destailleur
4e3dd4c927 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-28 14:38:22 +02:00
Laurent Destailleur
e8b5fc5d06 Fix css to add bold border must be forced only when not previously done 2016-07-28 14:37:36 +02:00
Laurent Destailleur
d619a641ce Fix regression (empty log were output) 2016-07-28 14:11:41 +02:00
Laurent Destailleur
801da08c76 FIX syntax error sql due to multicurrency 2016-07-28 14:10:43 +02:00
Laurent Destailleur
3639d30389 FIX Error is not returned 2016-07-28 14:07:59 +02:00
Laurent Destailleur
aae2086ada Move notes on dedicated tabs like other elements. 
Rename also the note available into translation tab into "other" to
avoid confusion because it was not the same usage.
 2016-07-28 13:53:17 +02:00
Laurent Destailleur
629271cf85 FIX Bad position of parameters on llxHeader (so online help not visible) 2016-07-28 12:23:07 +02:00
Laurent Destailleur
e5d0258f33 Fix missing css 2016-07-28 12:22:23 +02:00
Laurent Destailleur
01417b89c3 FIX Bad position of parameters on llxHeader (so online help not visible) 2016-07-28 12:17:00 +02:00
Laurent Destailleur
463a130a60 FIX #5457 2016-07-28 11:53:06 +02:00
Laurent Destailleur
f54946bacb Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
 2016-07-28 10:10:58 +02:00
Laurent Destailleur
37a1b8cbc8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-28 10:09:42 +02:00
Laurent Destailleur
dfa33bf173 Fix men unot visible 2016-07-28 10:09:13 +02:00
Laurent Destailleur
209bb213c0 Merge pull request #5475 from IonAgorria/ordersup-trigger 
New: Trigger for set status in supplier order
 2016-07-28 09:48:04 +02:00
Laurent Destailleur
0334b58a4b Hide feature not yet validated to be ready for a stable 4.0 2016-07-27 20:24:30 +02:00
Laurent Destailleur
fb8f0ed657 FIX #5503 2016-07-27 20:05:22 +02:00
Laurent Destailleur
2a28d77eeb FIX #5465 - Fix type account_parent 2016-07-27 19:53:16 +02:00
Laurent Destailleur
889b15689b FIX #5510 2016-07-27 19:42:09 +02:00
Laurent Destailleur
972baa34e7 FIX #5512 2016-07-27 19:36:17 +02:00
Laurent Destailleur
c242e53db6 FIX #5523 2016-07-27 19:23:40 +02:00
Laurent Destailleur
7e37cbb9e3 Fix resource module can't work because mandatory data not available. 2016-07-27 19:16:21 +02:00
Laurent Destailleur
8b3136cb96 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/companies.lang
 2016-07-27 19:04:55 +02:00
Laurent Destailleur
968827172d FIX #5534 2016-07-27 18:49:34 +02:00
Laurent Destailleur
799226728d Fix default rule for margin is choice 3: so cost price, then pmp if not 
defined, then bestu supplier price if not defined
 2016-07-27 18:05:44 +02:00
Laurent Destailleur
12514d0f81 FIX #5543 2016-07-27 17:50:38 +02:00
Laurent Destailleur
58faf94dfc Fix doxygen 2016-07-27 17:41:21 +02:00
Laurent Destailleur
5fa8a6c311 Fix to avoid pb of performances 2016-07-27 17:40:19 +02:00
Laurent Destailleur
38471f1670 Fix: use reposition 2016-07-27 17:29:27 +02:00
Laurent Destailleur
3b1d6818b8 Update ldap translation 2016-07-27 17:26:04 +02:00
Laurent Destailleur
4d1885eb59 Fix: restore logout and logged translation key 2016-07-27 17:00:14 +02:00
Laurent Destailleur
e747c39809 Add test on curl prerequisite. Remove test on GD lib. 2016-07-27 16:52:02 +02:00
Laurent Destailleur
eb06f56164 Fix bad version into error message 2016-07-27 16:49:00 +02:00
Laurent Destailleur
eddac89bad FIX Fatal error if curl not installed 2016-07-27 16:45:13 +02:00
Laurent Destailleur
f71b5d0605 FIX #5524 2016-07-27 14:19:13 +02:00
Laurent Destailleur
e4f51b7f32 FIX Select new thirdparty 2016-07-27 14:15:58 +02:00
Laurent Destailleur
a147798f18 FIX Select new thirdparty 2016-07-27 14:15:14 +02:00
Laurent Destailleur
e65a8400e3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-27 14:09:51 +02:00
Laurent Destailleur
4508882ac8 git push origin developMerge branch 'EuskalMoneta-refactor-rest-api' into develop 2016-07-27 14:06:34 +02:00
Laurent Destailleur
ee0c77a305 Merge branch 'refactor-rest-api' of 
https://github.com/EuskalMoneta/dolibarr into
EuskalMoneta-refactor-rest-api

Conflicts:
	htdocs/api/admin/explorer.php
 2016-07-27 14:06:14 +02:00
Laurent Destailleur
03767286ef Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-07-27 12:32:01 +02:00
Laurent Destailleur
7dc01fc9c1 Fix hide this api 2016-07-27 12:26:32 +02:00
Laurent Destailleur
5a36aa7780 Merge pull request #5548 from atm-arnaud/FIX_facture_thirdparty_parent_if_empty 
Update paiement.php
 2016-07-27 11:56:55 +02:00
Laurent Destailleur
700421179f Merge pull request #5557 from aspangaro/4.0-p36 
FIX Presentation correction
 2016-07-27 11:15:40 +02:00
Laurent Destailleur
c23fe43b62 Merge pull request #5556 from olsesacl/#5516 
FIX #5516 PHP7 warning on supplier module's invoices configuration page
 2016-07-27 11:15:21 +02:00
Laurent Destailleur
198adcf440 Merge pull request #5555 from olsesacl/#5515 
FIX #5515 PHP7 warnings on project module's configuration page
 2016-07-27 11:14:50 +02:00
Laurent Destailleur
51566970ce Merge pull request #5554 from olsesacl/#5514 
FIX #5514 PHP7 Warning on barcode module's configuration page
 2016-07-27 11:13:49 +02:00
Laurent Destailleur
8959b13bc3 Merge pull request #5553 from olsesacl/#5511 
FIX #5511 Accessing Direct Printing Jobs clears left menu
 2016-07-27 11:13:28 +02:00
Laurent Destailleur
a790a97009 Merge pull request #5550 from olsesacl/#5519 
FIX #5519 Bug: Intervention resources tab issues fatal error
 2016-07-27 11:12:05 +02:00