Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
43,243 Commits 36 Branches 189 Tags
4da8fb901b0d28385fb5f94dd52f412b8c1e15fe
Commit Graph

3280 Commits

Author SHA1 Message Date
Jean-François Ferry
e4962e9efd Add resource card 2014-05-10 22:07:13 +02:00
Jean-François Ferry
5f74b86b18 Add dictionary to define type of resources 2014-05-10 22:07:12 +02:00
Jean-François Ferry
87419bf357 Add lang chains 2014-05-10 22:07:12 +02:00
Jean-François Ferry
703572cd5b Add en_US langfile for resource module 2014-05-10 22:07:12 +02:00
Jean-François Ferry
9e542397ef Missing lang key 2014-05-10 22:06:22 +02:00
Jean-François Ferry
d9c567ca3d Prepare structure for upstream merge 2014-05-10 22:03:05 +02:00
Laurent Destailleur
33fe18490a Removed useless translation key 2014-05-10 15:50:32 +02:00
Laurent Destailleur
40577ab445 New: Can enter holiday for someone else if user has permission for. 2014-05-07 15:03:05 +02:00
Laurent Destailleur
77e85fe821 Merge pull request #1574 from marcosgdf/usability 
Improved usability of install wizard
 2014-05-06 10:12:28 +02:00
Laurent Destailleur
dca53accaf Fix: translation 2014-05-05 18:30:07 +02:00
Laurent Destailleur
131f133e07 New: Merge free product and predefined product area to enter new 
product (Supplier orders now use same template than customer
orders/proposal/invoices).
 2014-05-05 17:59:43 +02:00
Laurent Destailleur
d224128c46 New: Merge free product and predefined product area to enter new 
product.
 2014-05-05 14:30:08 +02:00
Marcos García de La Fuente
d0e5d9fd1b Improved usability of install wizard 2014-05-05 12:08:19 +02:00
Laurent Destailleur
bc35728ea3 Merge pull request #1562 from marcosgdf/translation 
Improved translations
 2014-05-04 17:39:36 +02:00
Marcos García de La Fuente
21c416805a Moved the info about hidden constants DONOTSEARCH_ANYWHERE to a tooltip 2014-05-03 12:57:12 +02:00
Marcos García de La Fuente
e155609712 Added missing translation keys 2014-05-03 12:25:24 +02:00
Laurent Destailleur
dfb81e7997 Sync transifex 2014-05-02 16:52:32 +02:00
Marcos García de La Fuente
3c0263e80b Corrected duplicate translation keys 2014-05-02 12:51:05 +02:00
Marcos García de La Fuente
e53c55002f Added missing translations 2014-05-01 16:23:18 +02:00
Marcos García de La Fuente
32e46030b9 Missing translation in export module 2014-05-01 16:10:11 +02:00
Laurent Destailleur
569d4cfd41 Merge pull request #1556 from FHenry/develop 
Enable option clone target emailing
 2014-05-01 11:08:05 +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
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
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
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
6a916a4ce9 Add sq_AL (albanian) language 2014-04-06 23:29:07 +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
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 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