Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-21 17:01:19 +01:00
Code Issues Packages Projects Releases Wiki Activity
49,918 Commits 36 Branches 190 Tags
d71ccc4a0292f3bbdd449768b51a4c310f4e744c
Commit Graph

8331 Commits

Author SHA1 Message Date
Gauthier
fa26b284a9 FIX : Line break display as a block 2015-07-21 16:39:00 +02:00
Laurent Destailleur
814cec880a Fix filter can be empty 2015-07-21 13:38:24 +02:00
Gauthier
f18c983ba5 NEW : print event type on third party card tab agenda list (only if AGENDA_USE_EVENT_TYPE = 1) 
Conflicts:
	htdocs/core/lib/company.lib.php
 2015-07-21 11:06:00 +02:00
Laurent Destailleur
38d30b5590 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/fourn/facture/card.php
 2015-07-21 00:17:11 +02:00
Laurent Destailleur
84be353e13 Comments 2015-07-21 00:13:13 +02:00
Raphaël Doursenaud
0d897a1307 NEW: log hooks loading 
This will help debugging bad hooks behavior.
 2015-07-20 18:30:49 +02:00
Laurent Destailleur
fdbfc7facd Fix missing language load 2015-07-19 15:48:35 +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
Marcos García de La Fuente
8505e91469 Fix: [ bug 1791 ] Margin menu not available if any Finance module is not enabled 2015-07-19 13:46:25 +02:00
Laurent Destailleur
2f2b0df6f8 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/contact/exportimport.php
	htdocs/contact/info.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/core/tpl/document_actions_pre_headers.tpl.php
	htdocs/langs/fr_FR/categories.lang
	htdocs/main.inc.php
	htdocs/product/reassort.php
	htdocs/projet/list.php
	htdocs/societe/info.php
 2015-07-19 12:26:31 +02:00
Laurent Destailleur
2bb1945a2f Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/prelevement/class/rejetprelevement.class.php
	htdocs/compta/sociales/class/paymentsocialcontribution.class.php
	htdocs/contact/exportimport.php
	htdocs/contact/ldap.php
	htdocs/contact/perso.php
	htdocs/contact/vcard.php
	htdocs/core/class/commonobject.class.php
	htdocs/product/reassort.php
	htdocs/projet/liste.php
	htdocs/societe/consumption.php
	htdocs/societe/info.php
 2015-07-19 12:04:30 +02:00
Laurent Destailleur
fbc0b5b313 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/contact/vcard.php
	htdocs/societe/consumption.php
 2015-07-19 11:38:44 +02:00
Laurent Destailleur
eec1f4dcdf Merge pull request #3267 from Dolibarr/3.8 
fix user role and uk_user_api_key if api module not enabled
 2015-07-18 23:51:51 +02:00
Marcos García de La Fuente
7185cfeb84 Fix: [ bug #2715 ] Statistics page has broken layout with long thirdparty names 2015-07-18 14:48:59 +02:00
Marcos García de La Fuente
e9d1e6265d Fix: [ bug #2696 ] Adding complementary attribute fails if code is numerics 
Close #2696
 2015-07-18 14:25:05 +02:00
aspangaro
b9b6abd7a8 Merge remote-tracking branch 'Upstream/3.8' into 3.8-1 2015-07-18 05:29:57 +02:00
Juanjo Menent
06684ea362 Merge pull request #3250 from aspangaro/3.8-patch7 
Fix: #3228 [Export] Missing member ID field in users
 2015-07-17 19:15:53 +02:00
Juanjo Menent
0971e88531 Merge pull request #3249 from aspangaro/3.8-patch6 
Fix: #3230 [Leaves] Module setup page is useless
 2015-07-17 19:15:31 +02:00
Juanjo Menent
9c6573edd4 Merge pull request #3248 from aspangaro/3.8-patch5 
Fix: #3232 [Agenda] Setup page tab order is weird
 2015-07-17 19:14:34 +02:00
Juanjo Menent
efde88d211 Merge pull request #3247 from aspangaro/3.8-patch4 
Fix: [Homepage] colspan problem with tasks box
 2015-07-17 19:13:44 +02:00
Gauthier
244d1839e4 FIX : load propal langs for availability traduction 2015-07-17 17:24:11 +02:00
aspangaro
a0d74cc1a1 Fix: #3228 [Export] Missing member ID field in users 2015-07-16 22:50:50 +02:00
aspangaro
440e144892 Fix: #3230 [Leaves] Module setup page is useless 2015-07-16 22:29:04 +02:00
aspangaro
2d3d78ecc0 Fix: #3232 [Agenda] Setup page tab order is weird 2015-07-16 22:16:11 +02:00
aspangaro
f970494d1e Fix: [Homepage] colspan problem with tasks box 2015-07-16 21:29:15 +02:00
aspangaro
3b547c0979 Fix: #3244 [Homepage] Last n members link broken 2015-07-16 21:17:31 +02:00
aspangaro
d9dd9ff688 Merge remote-tracking branch 'Upstream/3.8' into 3.8-1 2015-07-16 12:25:37 +02:00
Laurent Destailleur
e992a959cd Fix dbt_select 2015-07-16 10:59:00 +02:00
Laurent Destailleur
670842429c Merge pull request #3202 from hregis/3.8_minor 
Fix missing mode
 2015-07-16 10:24:37 +02:00
Laurent Destailleur
cbce66bba8 Merge pull request #3190 from hregis/3.8_bug2 
Fix: wrong path and add index.html
 2015-07-16 10:07:31 +02:00
aspangaro
4ae15adc69 Fix: wrong link on leave tabs in user card 2015-07-16 06:10:51 +02:00
aspangaro
efbaeaab5c Fix: Show vat_by_thirdparty when module accounting is on 2015-07-15 23:24:28 +02:00
aspangaro
892462e0d6 Fix: Show VAT when module accounting is on 2015-07-15 22:45:45 +02:00
aspangaro
59e88590e0 Move my address email to new one 2015-07-15 20:30:33 +02:00
aspangaro
4a899cd856 Typo 2015-07-15 19:13:23 +02:00
Laurent Destailleur
db67ab0b5e Fix wrap into lang list. 
Sync with transifex
 2015-07-15 16:27:01 +02:00
Laurent Destailleur
e571f681a0 Fix can refuse expense report 2015-07-15 15:39:50 +02:00
Laurent Destailleur
4d6ce2a1de Fix: Can't view thirdparties that are not customer nor prospect nor 
supplier.
 2015-07-15 12:42:50 +02:00
Regis Houssin
c41c02adc7 Fix missing mode 2015-07-14 15:52:51 +02:00
Laurent Destailleur
65f11d0abb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-14 14:44:08 +02:00
Laurent Destailleur
581b6d0001 Fix: missing status on contacts 2015-07-14 11:51:27 +02:00
Laurent Destailleur
85d9d3587e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-13 16:25:43 +02:00
Laurent Destailleur
a9289de616 Several fixes. Fix #2927 2015-07-13 11:22:18 +02:00
Laurent Destailleur
0c9e984bb1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-13 10:29:45 +02:00
Regis Houssin
f23afc3453 Fix: wrong path and add index.html 2015-07-13 10:07:38 +02:00
Laurent Destailleur
8690b5e70e FIX #3173 Overlapping of shipment ref 2015-07-12 16:22:06 +02:00
Laurent Destailleur
1fb40565f4 Fix bad parameters of function select_date 2015-07-12 12:50:24 +02:00
Laurent Destailleur
39a9b41c42 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-12 12:31:37 +02:00
Laurent Destailleur
21a5a30ade Merge pull request #3175 from All-3kcis/develop-patch-3 
Fix #3158 can't change date in invoices
 2015-07-12 12:21:46 +02:00