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

4492 Commits

Author SHA1 Message Date
aspangaro
31b90cf383 Add 1st version of calculator but need work 2014-11-17 06:38:06 +01:00
aspangaro
c256243bf7 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-16 08:41:39 +01:00
Laurent Destailleur
4df754f36f Merge pull request #2015 from aspangaro/develop-patch 
Update accounting language
 2014-11-15 12:19:23 +01:00
Laurent Destailleur
58c06264e4 Merge branch 'develop' of github.com:BadPixxel/dolibarr into 
BadPixxel-develop

Conflicts:
	htdocs/langs/en_US/categories.lang
	htdocs/langs/fr_FR/categories.lang
 2014-11-15 12:17:46 +01:00
aspangaro
a55afd4f50 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-12 07:32:32 +01:00
aspangaro
c268b1fb64 Update accounting language 
Problem with transifex in french, the file is in french language on the website but in github, still in english...
 2014-11-11 14:49:26 +01:00
aspangaro
3042bf4dc2 Correct lot of bugs 2014-11-10 06:08:50 +01:00
Laurent Destailleur
50f690787b Sync transifex 2014-11-09 19:16:41 +01:00
aspangaro
9c3fa5a9eb Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-09 07:26:14 +01:00
Laurent Destailleur
5094c2c066 Merge pull request #1998 from frederic34/iconstock 
Try to improve stock display for all stock increase/decrease options
 2014-11-07 21:48:04 +01:00
Laurent Destailleur
9e92b469b9 Merge pull request #2005 from altairis-fr/hidemargininfos 
improve "hide margin infos" button : hide ALL informations relatives to margin AND store the state of the button in a cookie instead of shared config option
 2014-11-07 21:47:06 +01:00
aspangaro
840dfd780d Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-07 21:28:39 +01:00
Laurent Destailleur
60ca5aa026 Debug of module withdraw. 2014-11-05 17:32:42 +01:00
Christophe Battarel
44882f4035 improve "hide margin infos" button : hide ALL informations relatives to margin AND store the state of the button in a cookie instead of shared config option 2014-11-05 17:03:53 +01:00
Laurent Destailleur
5e0946bdc2 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/adherents/fiche.php
	htdocs/core/lib/date.lib.php
	htdocs/langs/fr_FR/bills.lang
	htdocs/resource/class/resource.class.php
 2014-11-05 16:37:07 +01:00
Laurent Destailleur
90fb05805c Fix: Missing translation 2014-11-05 16:21:17 +01:00
aspangaro
25433120e6 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-04 06:16:03 +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
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
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