Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-19 07:51:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
63,293 Commits 36 Branches 190 Tags
cad2fedf70a54dee93551a6be7807a2a3f9f2018
Commit Graph

3848 Commits

Author SHA1 Message Date
Laurent Destailleur
3d2dc3c66e NEW Each user can select its landing page. 2016-07-26 21:12:52 +02:00
Laurent Destailleur
b615b52f47 FIX html detection fails if only u tag is present 2016-07-26 16:11:38 +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
Laurent Destailleur
f0a3a5ce02 NEW Mutualize mass action. So "Send by email" is also avavilable on 
orders.
 2016-07-25 21:50:41 +02:00
Laurent Destailleur
3265b7028d Merge remote-tracking branch 'origin/4.0' into develop 2016-07-25 19:53:28 +02:00
Marcos García de La Fuente
c082505021 NEW Added product attributes feature 2016-07-24 11:27:52 +02:00
Laurent Destailleur
07d0f457b4 Fix: files generated by mass action could not be loaded 2016-07-23 12:44:28 +02:00
Laurent Destailleur
a37caae098 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-20 19:01:55 +02:00
Laurent Destailleur
699f857a5e NEW Add option PROJECT_LINES_PERWEEK_SHOW_THIRDPARTY to show thirdparty 
on page to submit time.
 2016-07-20 18:02:33 +02:00
All3kcis
f4705873cb Update functions.lib.php 
Remove useless verification on $level. Second check "in_array" line 624 is sufficient with strict mode.
Otherwise "Emerg level" is not possible with "empty($level).. LOG_EMERG = 0...
 2016-07-19 15:27:03 +02:00
Laurent Destailleur
e2a03d18dd Merge remote-tracking branch 'origin/4.0' into develop 2016-07-16 19:58:36 +02:00
Laurent Destailleur
553981426e Several minor fixes in expense reports 2016-07-16 15:21:38 +02:00
Laurent Destailleur
9ba1ca5acb Merge branch 'abb-14' of https://github.com/bafbes/dolibarr into bafbes-abb-14 
Conflicts:
	htdocs/langs/en_US/companies.lang
 2016-07-15 17:05:12 +02:00
Laurent Destailleur
9512bf1ac7 Add phpunit tests for option USE_STRICT_CSV_RULES 2016-07-15 12:30:24 +02:00
Laurent Destailleur
ca5c912432 Merge pull request #5370 from IonAgorria/fix-fetchline 
NEW: Add getElementProperties entry for proposal line
 2016-07-15 10:02:20 +02:00
Laurent Destailleur
8fcd2fd76c Merge pull request #5436 from atm-alexis/FIX_3.8_bug_4682 
FIX #4682 dol_time_plus_duree use datetime instead of strtotime
 2016-07-14 23:02:38 +02:00
Laurent Destailleur
9bd937a3bc Merge remote-tracking branch 'origin/3.9' into 4.0 2016-07-14 00:35:59 +02:00
Laurent Destailleur
0ad0755f4d Merge remote-tracking branch 'origin/3.9' into develop 2016-07-14 00:35:09 +02:00
Laurent Destailleur
10e7fa51fc Fix missing parameters to provide all information required for 
substitution hooks
 2016-07-13 23:06:41 +02:00
Laurent Destailleur
dc51eb0b75 Fix missing badge 2016-07-13 22:21:18 +02:00
Laurent Destailleur
9c06e07f07 Code comment 2016-07-12 13:03:56 +02:00
Laurent Destailleur
1efedbdade Fix badge on project tab 2016-07-11 10:37:43 +02:00
Laurent Destailleur
bfb48ecce9 Where is the info tab of project ? 2016-07-09 15:30:42 +02:00
Laurent Destailleur
0e4dcb301c Fix several bugs into projects 2016-07-09 13:58:46 +02:00
Laurent Destailleur
d8d938e82c Fix performance problems Enter new time spent duration becoma < 1s 
instead of 30s with 5000 tasks.
 2016-07-08 17:06:12 +02:00
Laurent Destailleur
999341c1a2 Better performance 2016-07-08 12:02:09 +02:00
florian HENRY
1bb28648c4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_fix5353

Conflicts:
	build/pad/DoliWamp.pml
	build/pad/Dolibarr.pml
	build/pad/pad_dolibarr.xml
	build/pad/pad_doliwamp.xml
 2016-07-07 09:05:13 +02:00
Laurent Destailleur
0af555126c Fix PHPCS 2016-07-06 11:23:32 +02:00
florian HENRY
afb924043f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_fix5353

Conflicts:
	htdocs/core/modules/mailings/advthirdparties.modules.php
 2016-07-04 20:43:14 +02:00
Laurent Destailleur
76d24ac8ca Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-02 11:27:13 +02:00
Laurent Destailleur
91d2d573c3 Fix NNE has been replaced with ICS 2016-07-02 11:26:55 +02:00
florian HENRY
32e954c8d8 Merge branch 'develop' of local repository into dev_fix5353 2016-07-01 15:08:15 +02:00
Laurent Destailleur
5713d293e3 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2016-07-01 03:22:16 +02:00
Laurent Destailleur
625213580c Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2016-07-01 03:17:20 +02:00
Laurent Destailleur
3645bd8f69 Merge pull request #5420 from atm-alexis/FIX_3.8_bug_5170 
FIX #5170 tva sign with INVOICE_POSITIVE_CREDIT_NOTE option
 2016-07-01 03:06:31 +02:00
Laurent Destailleur
05384b2f88 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/facture/list.php
	htdocs/projet/card.php
	htdocs/societe/consumption.php
 2016-07-01 02:39:29 +02:00
Laurent Destailleur
29e26c2342 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/lib/sendings.lib.php
 2016-07-01 02:06:30 +02:00
florian HENRY
37ee64ae9b fix 4672 2016-06-30 17:10:06 +02:00
Alexis Algoud
afeb212520 FIX #4682 dol_time_plus_duree use datetime instead of strtotime 2016-06-30 16:16:27 +02:00
florian HENRY
d431e73ec8 Fix #5353 2016-06-30 15:49:57 +02:00
Alexis Algoud
22bc44620b FIX #5170 tva sign with INVOICE_POSITIVE_CREDIT_NOTE option 2016-06-30 14:27:58 +02:00
Laurent Destailleur
933ec6c118 FIX detection of HTML content when only p tag is present. 2016-06-29 13:14:53 +02:00
gauthier
d9035e5308 FIX : receiving link never works 2016-06-28 11:41:23 +02:00
Laurent Destailleur
2767df2e01 FIX Solve problem of sending joinded files of another email when several 
tabs are opened on form to send emails.
 2016-06-24 16:10:52 +02:00
Laurent Destailleur
2e4c6597d8 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
 2016-06-23 21:05:00 +02:00
Laurent Destailleur
91e13d23fe Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-23 20:20:16 +02:00
Scrutinizer Auto-Fixer
23620e3133 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2016-06-23 18:19:43 +00:00
Laurent Destailleur
2223ec15d1 Fix doxygen errors 2016-06-23 20:19:35 +02:00
Frédéric FRANCE
3690d11ca2 Update pdf.lib.php 2016-06-23 10:48:52 +02:00
Laurent Destailleur
4a408e76e7 Fix download of mass generated files. 2016-06-22 21:06:08 +02:00