Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-14 13:31:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
43,243 Commits 36 Branches 190 Tags
4da8fb901b0d28385fb5f94dd52f412b8c1e15fe
Commit Graph

5199 Commits

Author SHA1 Message Date
Laurent Destailleur
569d4cfd41 Merge pull request #1556 from FHenry/develop 
Enable option clone target emailing
 2014-05-01 11:08:05 +02:00
Juanjo Menent
3b97e1ae1c Trad: Update es_ES from transifex 2014-05-01 09:42:38 +02:00
Juanjo Menent
cdf5155d87 Trad: Update es_ES from transifex 2014-05-01 09:22:31 +02:00
Laurent Destailleur
11115eb773 Fix: Bad link 
Trans: Add missing translation keys.
 2014-04-29 23:34:36 +02:00
Florian HENRY
596be3ae44 Trad contact card 2014-04-29 09:43:16 +02:00
Laurent Destailleur
d5c781158d Merge pull request #1555 from aspangaro/develop 
HRM Area - Typo & presentation
 2014-04-28 02:41:36 +02:00
aspangaro
e03be4f6ed HRM Area - Typo & presentation 2014-04-27 04:08:34 +02:00
Laurent Destailleur
0ab4265456 Fix: Missing translation key. 2014-04-27 01:20:32 +02:00
Laurent Destailleur
97fce71218 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/errors.lang
	htdocs/product/fiche.php
	htdocs/projet/tasks/task.php
 2014-04-26 22:35:35 +02:00
Laurent Destailleur
950c59eb61 Fix: [ bug #1356 ] Bank accountancy number is limited to 8 numbers. 2014-04-26 17:34:39 +02:00
Laurent Destailleur
6968304641 Fix: [ bug #1352 ] Removing a shipping does not remove the delivery. 2014-04-26 17:27:59 +02:00
Laurent Destailleur
c54d9d9171 Fix: [ bug #1351 ] VIES verification link broken 2014-04-26 16:27:06 +02:00
Laurent Destailleur
3a7a15cff8 Trans: text more clear 2014-04-25 15:00:18 +02:00
Laurent Destailleur
caf6712286 Add message on disconnect button when using an authentication mode where 
disconnect has no sense.
 2014-04-23 12:29:41 +02:00
Laurent Destailleur
0058bea8e0 Fix typo 2014-04-23 10:22:03 +02:00
Raphaël Doursenaud
e6c0321fb6 Automatic events for project tasks 2014-04-22 15:30:10 +02:00
philippe
8564691896 Fix some misspelling 2014-04-21 09:46:03 +02:00
Laurent Destailleur
825ae377b0 Merge pull request #1534 from squarou/develop 
Add 2 lang variables for new tab in adherent
 2014-04-19 23:59:24 +02:00
Laurent Destailleur
229e5211c5 Sync from transifex 2014-04-18 11:04:12 +02:00
Laurent Destailleur
ce34c01b9e New: On page to enter supplier prices, if there is no supplier, add 
direct link to create one.
Qual: The following hooks are now 'addreplace'
hooks: "formCreateThirdpartyOptions" so check that return value is 0 to
keep default standard behaviour after hook or 1 to disable default
standard behaviour.
 2014-04-16 00:06:16 +02:00
Benjamin
c87515d3a1 Add 2 lang variables for new tab in adherent 
Added MembersStatisticsByRegion and MembersByRegion
 2014-04-14 11:18:14 +02:00
Laurent Destailleur
1b02cdd352 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	dev/initdata/mysqldump_dolibarr_3.5.0.sql
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/product/index.php
	htdocs/user/fiche.php
 2014-04-12 00:53:25 +02:00
Laurent Destailleur
7fcf57ca5a Fix: SQL request for export. Extra field missing. 2014-04-10 18:36:34 +02:00
Laurent Destailleur
ab3bbf8e0b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop
 2014-04-07 13:15:26 +02:00
Laurent Destailleur
a96f762f40 Sync from transifex. 2014-04-07 09:23:50 +02:00
Laurent Destailleur
5eeb6b8445 Fix: Use "Space" instead of " " when we need space as Thousand 
Separator.
 2014-04-06 23:43:32 +02:00
Laurent Destailleur
6a916a4ce9 Add sq_AL (albanian) language 2014-04-06 23:29:07 +02:00
Laurent Destailleur
1c21c00fb6 New: Can use "Space" as value for SeparatorThousand into language files 2014-04-06 21:18:21 +02:00
Laurent Destailleur
6cb39ea3dc Fix: Missing message keys 2014-04-06 14:49:04 +02:00
Laurent Destailleur
d595b96c8e New: Paypal return for subscription show more information and direct 
link into email.
Qual: Better management of error when creating subscription of member
not linked to a third party.
 2014-04-06 14:22:08 +02:00
Laurent Destailleur
d2b1b1a86c Merge branch 'actiontriggers' of 
https://github.com/GPCsolutions/dolibarr into
GPCsolutions-actiontriggers

Conflicts:
	htdocs/langs/de_DE/other.lang
 2014-04-04 23:47:36 +02:00
Laurent Destailleur
d2cb5e8d2d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-31 22:56:47 +02:00
Laurent Destailleur
897a9b7446 Sync from transifex. 2014-03-31 19:01:28 +02:00
Raphaël Doursenaud
ab623e3ff1 Fixed typo 2014-03-31 14:21:23 +02:00
Laurent Destailleur
b675b9b610 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/action/fiche.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/fourn/facture/fiche.php
	htdocs/langs/en_US/admin.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/projet/tasks/task.php
 2014-03-31 00:44:45 +02:00
Raphaël Doursenaud
771f205d2a Langs: added translation string for action triggers that were missing 2014-03-27 12:04:03 +01:00
Raphaël Doursenaud
5acfb5adc7 Langs: removed duplicate key 2014-03-27 12:04:03 +01:00
Raphaël Doursenaud
e07e86b824 Deduplicated lines of the reference language files 
Used the new deduplicatefilelinesrecursively.sh script
 2014-03-27 12:04:03 +01:00
Raphaël Doursenaud
cd7a378eb0 Action triggers/Langs: fixed a bad translation key 2014-03-27 12:04:03 +01:00
Laurent Destailleur
6039c81845 Fix: copy to clipboard does not work with jmobile 
Fix: Bad translation
 2014-03-23 20:56:41 +01:00
Laurent Léonard
1663a7a6fa Fix thousands separator in french (Belgium) language file 2014-03-23 14:46:09 +01:00
Juanjo Menent
334455f8dd Update es_ES from transifex 2014-03-22 10:28:24 +01:00
Juanjo Menent
79ab420997 Update es_ES from transifex 2014-03-22 09:41:14 +01:00
Laurent Destailleur
29534b4ef5 Removed not used keys 2014-03-21 18:51:39 +01:00
Laurent Destailleur
63bb09fbdf Fix: Removed duplicate translation 2014-03-20 00:21:52 +01:00
Laurent Destailleur
68396e023c New: When creating an invoice all types are visible (even if for the 
moment we just show an help text to explain how to use type credit note
and deposit).
 2014-03-19 23:49:07 +01:00
Laurent Destailleur
f9c1b590d0 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/facture.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/filefunc.inc.php
 2014-03-19 22:29:18 +01:00
aspangaro
59128ccefb Merge branch 'upstream/develop' 2014-03-17 21:10:15 +01:00
Laurent Destailleur
82c2ef9773 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-17 20:45:09 +01:00
Laurent Destailleur
7eea96c07c Minor fix into standing order. 2014-03-17 20:43:01 +01:00