Commit Graph

56393 Commits

Author SHA1 Message Date
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
Laurent Destailleur
86e4340287 FIX: More robust autodetection of relative url to redirect to make
install when conf file does not exists yet.
2016-07-27 10:57:05 +02:00
aspangaro
2e4bebbaf9 FIX Presentation correction 2016-07-27 07:24:36 +02:00
Sergio Sanchis Climent
227c6906a8 FIX #5516 2016-07-26 23:26:29 +02:00
Sergio Sanchis Climent
3b57727542 PHP7 warnings on project module's configuration page 2016-07-26 22:22:55 +02:00
Sergio Sanchis Climent
c9fa12a8f9 PHP7 Warning on barcode module's configuration page 2016-07-26 22:09:06 +02:00
Sergio Sanchis Climent
7eed738fce Fix: Accessing Direct Printing Jobs clears left menu 2016-07-26 21:53:03 +02:00
Laurent Destailleur
ae0b90d61e Fix doxygen 2016-07-26 21:25:12 +02:00
Laurent Destailleur
3d2dc3c66e NEW Each user can select its landing page. 2016-07-26 21:12:52 +02:00
Ion Agorria
078439cf18 Use different trigger name per status 2016-07-26 19:53:29 +02:00
Marcos García de La Fuente
1ef27913d7 FIX #5549 getNomUrl tooltips show Order info even if user has no rights to read them 2016-07-26 17:07:56 +02:00
Laurent Destailleur
a167d56d5a Hard code a warning to avoid confusion. 2016-07-26 16:40:37 +02:00
Sergio Sanchis Climent
7481cfc1a3 FIX #5519 2016-07-26 16:35:54 +02:00
Laurent Destailleur
b615b52f47 FIX html detection fails if only u tag is present 2016-07-26 16:11:38 +02:00
Laurent Destailleur
92cf979214 Update copyright of external lib 2016-07-26 16:01:25 +02:00
Laurent Destailleur
6d0ebbc4a3 Merge pull request #5424 from atm-florian/dev_fix5353
NEW #5353 IBAN and BIC should be now always mandatory for all country regarding accounting managment
2016-07-26 15:57:56 +02:00
Laurent Destailleur
a1c959e9d6 Merge pull request #5536 from defrance/patch-17
NEW add edition feature on action/agenda element
2016-07-26 15:29:45 +02:00
Laurent Destailleur
730e6f4c4a Merge pull request #5531 from defrance/patch-16
Add : additionnal origin of mouvement
2016-07-26 15:26:46 +02:00
Laurent Destailleur
f47f39f69a Fix width and remove hours on date into table 2016-07-26 14:45:22 +02:00
Laurent Destailleur
14cb6d73bc Fix date into new gantt chart 2016-07-26 14:41:15 +02:00
Laurent Destailleur
03cb5c66b8 Fix javascript error on french language 2016-07-26 14:17:45 +02:00
Laurent Destailleur
2866d60240 Revert "change jsgantt to jsGanttImproved"
This reverts commit caf963351b.
2016-07-26 13:59:08 +02:00
Sergio Sanchis Climent
71d153c4e2 change jsgantt to jsGanttImproved 2016-07-26 13:56:34 +02:00
Laurent Destailleur
9e70f49fc5 Update changelog 2016-07-26 13:56:11 +02:00
Laurent Destailleur
c0db2e8b38 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-26 13:52:55 +02:00
Laurent Destailleur
27e0859051 Fix travis error 2016-07-26 13:52:43 +02:00
Laurent Destailleur
a3d0c01b68 Fix warning 2016-07-26 13:51:13 +02:00
Juanjo Menent
0459c6f682 Merge pull request #5545 from GPCsolutions/develop-orderinterfix
Fix: Fixed interventions from order.
2016-07-26 12:01:09 +02:00
Juanjo Menent
b4a88ca312 Merge pull request #5547 from olsesacl/#5520
FIX #5520 Bug: JavaScript error on project Gantt view
2016-07-26 11:59:48 +02:00
SAINT-PATRICE
d363205648 Update paiement.php
Test non optimisé
2016-07-26 11:55:26 +02:00
Laurent Destailleur
f0fa9205a2 Sync transifex 2016-07-26 09:56:20 +02:00
florian HENRY
e420a75fa0 SQL query style 2016-07-26 09:01:28 +02:00
florian HENRY
419dd3095b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
dev_fix5353

Conflicts:
	htdocs/societe/class/societe.class.php
2016-07-26 08:59:40 +02:00
Sergio Sanchis Climent
caf963351b change jsgantt to jsGanttImproved 2016-07-26 01:59:27 +02:00
Laurent Destailleur
e0f5a3cfe9 Fix send email in mass action 2016-07-25 21:51:29 +02:00
Laurent Destailleur
f0a3a5ce02 NEW Mutualize mass action. So "Send by email" is also avavilable on
orders.
2016-07-25 21:50:41 +02:00
Regis Houssin
4b8f42949c # WARNING: head commit changed in the meantime
Change-Id: I27dc1da6ca41955468f3661433e41c72a277f670
2016-07-25 21:05:11 +02:00
Laurent Destailleur
3265b7028d Merge remote-tracking branch 'origin/4.0' into develop 2016-07-25 19:53:28 +02:00