Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
54,329 Commits 36 Branches 189 Tags
9b1caefbf9c68ba433333efbeb125cb15d4b10dd
Commit Graph

6584 Commits

Author SHA1 Message Date
aspangaro
25433120e6 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-04 06:16:03 +01:00
Andrelec1
5074feacd6 Add option and create new class 2014-11-03 17:57:55 +01:00
Laurent Destailleur
54e2803926 Missing search table for interventions 2014-11-03 17:48:10 +01:00
Laurent Destailleur
cf6a0df3e4 A lot of fix in missing intervention trigger. Align key to use same name 
to avoid future bugs.
 2014-11-03 17:23:02 +01:00
Laurent Destailleur
155452ba91 Fix: Proposal deadlock situation 
New: Add missing trigger PROPAL_CLASSIFYBILLED.
 2014-11-03 16:20:55 +01:00
frederic34
77f1e587e6 Some translations 2014-11-01 22:08:18 +01:00
frederic34
f23f16da86 Try to improve stock display for all stock increase/decrease options 2014-11-01 21:38:50 +01:00
Laurent Destailleur
762eb1cd48 Style were lost 2014-11-01 20:04:01 +01:00
Laurent Destailleur
b8faed9fe8 Fix: translation 2014-11-01 19:50:56 +01:00
Laurent Destailleur
8d964e03d2 Merge branch 'agenda-export-by-project' of github.com:AMMD/dolibarr into 
AMMD-agenda-export-by-project

Conflicts:
	htdocs/admin/agenda_xcal.php
 2014-10-30 18:19:13 +01:00
Laurent Destailleur
6a1a0303d8 Merge pull request #1975 from frederic34/patch-1 
"Is Order shippable" icon
 2014-10-30 18:03:44 +01:00
Laurent Destailleur
3ffd4432df New: Add permissions to read all trips and expenses. 2014-10-30 11:43:57 +01:00
jfefe
c5045a75d8 Missing trans key into resource module 2014-10-30 01:16:37 +01:00
Laurent Destailleur
1669700148 Uniformize and clean boxes behaviour and translation. 2014-10-27 21:49:51 +01:00
Laurent Destailleur
0abeea059e Uniformize and clean boxes behaviour and translation. 2014-10-27 21:48:28 +01:00
Laurent Destailleur
2b08417b77 Fix: [ bug #1612 ] Adding free product line line with negative qty in 
credit notes, doesn't give error message
 2014-10-27 01:51:33 +01:00
Laurent Destailleur
9619c0cdea Fix: [ bug #1581 ] SQL injection possbile 2014-10-27 00:58:56 +01:00
Frédéric FRANCE
64a5a260dd Update admin.lang 2014-10-25 11:54:38 +02:00
Laurent Destailleur
a1a03a8061 New: Module notification has been enhanced: 
EMail use now language of target contact.
Can also define a fixed email for notifications.
Better error management
 2014-10-25 01:20:59 +02:00
Laurent Destailleur
0fc1c85b34 New: Module notification has been enhanced: 
EMail use now language of target contact.
Can also define a fixed email for notifications.
Better error management
 2014-10-25 00:42:52 +02:00
Frédéric FRANCE
ccbaba79fb Update deliveries.lang 2014-10-23 18:42:02 +02:00
Frédéric FRANCE
48a9be28a1 Update deliveries.lang 2014-10-23 18:39:12 +02:00
Laurent Destailleur
d396c62499 Fix: alignement 2014-10-22 23:49:52 +02:00
Laurent Destailleur
9278d21048 Add missing translation 2014-10-20 13:25:30 +02:00
Laurent Destailleur
0fba70d4d1 Fix: Triggers sending email for intervention and classify billed 2014-10-20 11:35:34 +02:00
Grégory DAVID
a794180586 Document the ability to export agenda calendar restricted to project ID 2014-10-18 16:41:47 +02:00
Laurent Destailleur
e53c328767 Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into 
aspangaro-develop-favorite

Conflicts:
	ChangeLog
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-10-18 15:45:44 +02:00
aspangaro
9f6a460d42 Merge remote-tracking branch 'Upstream/develop' into develop-favorite 
Resolve conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-10-18 15:32:50 +02:00
Laurent Destailleur
6a9d825a65 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-10-18 14:57:49 +02:00
Laurent Destailleur
85ce8f8fef Merge pull request #1959 from aspangaro/develop-usercolor 
Add field to select color of the user in user's card
 2014-10-18 14:57:19 +02:00
Laurent Destailleur
90d47cffae Better error management and better error message for reporting upload or 
error of images.
 2014-10-18 14:56:06 +02:00
Juanjo Menent
5dbdb50cd7 Trad: Syncro es_ES from Transifex 2014-10-17 20:35:49 +02:00
Laurent Destailleur
5513a44a07 Fix: translation. Use "template" instead of "pre-defined" 2014-10-17 14:17:52 +02:00
Laurent Destailleur
78d289110d Trans: Same verb 2014-10-17 13:07:23 +02:00
aspangaro
c1d016a531 Add field to select color of the user in user's card 2014-10-16 06:20:54 +02:00
Laurent Destailleur
38e4100e47 Better translation: Virtual product is a "package product". 2014-10-15 18:21:18 +02:00
aspangaro
861583bb77 Merge remote-tracking branch 'Upstream/develop' into develop-favorite 2014-10-14 06:12:46 +02:00
Laurent Destailleur
f498921715 Merge branch 'droposcommerce' of github.com:GPCsolutions/dolibarr into 
GPCsolutions-droposcommerce

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/vi_VN/admin.lang
	htdocs/langs/vi_VN/shop.lang
 2014-10-13 00:50:51 +02:00
aspangaro
dad9a54959 Merge remote-tracking branch 'Upstream/develop' into develop-favorite 2014-10-12 15:47:29 +02:00
aspangaro
71dafac03c Add favorite button into country dictionary to put value on top select list 2014-10-12 15:28:01 +02:00
Laurent Destailleur
f08759a17e Fix: area to generate doc must use half size not onethird. 
Fix: Missing maxwidthonsmartphone.
Fix: Missing backtopage
Fix: Missing translation key
 2014-10-12 11:59:52 +02:00
Laurent Destailleur
2b479aa0b4 Qual: Uniformize translated label of progress on all pages. 
Fix: Color of first line of documents.
Fix: The calculated progress was not calculated.
 2014-10-12 01:04:34 +02:00
Laurent Destailleur
a804fe62b4 Fix: translation for vi_VN 2014-10-11 15:46:37 +02:00
Laurent Destailleur
0dc82cddf1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/langs/es_ES/accountancy.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/agenda.lang
	htdocs/langs/es_ES/categories.lang
	htdocs/langs/es_ES/companies.lang
	htdocs/langs/es_ES/compta.lang
	htdocs/langs/es_ES/donations.lang
	htdocs/langs/es_ES/errors.lang
	htdocs/langs/es_ES/holiday.lang
	htdocs/langs/es_ES/interventions.lang
	htdocs/langs/es_ES/projects.lang
	htdocs/langs/es_ES/sendings.lang
	htdocs/langs/es_ES/suppliers.lang
 2014-10-11 14:42:45 +02:00
Laurent Destailleur
8a98f8461d Sync transifex 2014-10-11 14:33:22 +02:00
Juanjo Menent
f1104275b4 Trad: Syncro es_ES/compta.lang from transifex 2014-10-10 22:11:00 +02:00
Juanjo Menent
2f3abd3774 Trad: Syncro es_ES from transifex 2014-10-10 21:50:05 +02:00
Laurent Destailleur
a19e8aa89d Sync transifex 2014-10-09 17:15:15 +02:00
Laurent Destailleur
60a6e2a579 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-10-09 17:06:13 +02:00
Laurent Destailleur
06cc08026b Some fix on per user view. 2014-10-09 17:05:57 +02:00