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

892 Commits

Author SHA1 Message Date
Laurent Destailleur
568d5cb5ba Fixed: Tracking number restored on PDF shipments 
Fixed: Translation

Conflicts:
	htdocs/langs/en_US/agenda.lang
 2015-01-23 18:47:47 +01:00
Marcos García de La Fuente
7b4cf976df Corrected translation typos 2015-01-13 09:42:46 +01:00
Laurent Destailleur
f7e0ef74d7 Bad translation 2014-08-17 20:05:48 +02:00
Laurent Destailleur
db091896a5 Prepare 3.6. 
Use google adsense tag of foundation for doxygen doc pages.

Version is no more encoded int odoxygen.

Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/makepack-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/impayees.php
	htdocs/filefunc.inc.php
 2014-07-26 18:10:51 +02:00
Marcos García de La Fuente
7794101e10 Corrected VAT expenses behaviour name 2014-07-19 05:36:29 +02:00
Laurent Destailleur
7ee1388582 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-07-04 12:22:10 +02:00
Laurent Destailleur
11abba30b3 Fix: Add information to help debug pb with TZ. 2014-07-04 11:58:41 +02:00
aspangaro
bb4fed30a8 Salaries :: Missing key language & typo 2014-06-03 06:45:37 +02:00
Laurent Destailleur
e6f828cd86 Link to Preferred Partners missing. 2014-05-24 17:00:49 +02:00
aspangaro
376f140f64 Update en_US admin 2014-05-11 20:55:45 +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
e53c55002f Added missing translations 2014-05-01 16:23:18 +02:00
Laurent Destailleur
11115eb773 Fix: Bad link 
Trans: Add missing translation keys.
 2014-04-29 23:34:36 +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
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
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
e07e86b824 Deduplicated lines of the reference language files 
Used the new deduplicatefilelinesrecursively.sh script
 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
2889c3ac70 Qual: Feature to make payment of salaries has been moved into a module 
(module dedicated to manage salaries and salary payments).
Qual: Also module for employee to declare trip and expenses has been
moved into same place than module for employee to declare holidays
(into HRM top entry). It is not an accountancy module so no reason to
have it into entry "Accountancy".
 2014-03-17 14:30:55 +01:00
Laurent Destailleur
14d8bfef3a New: Improved Opensurvey module: Description of survey use wysiwig 
editor, More information shown on result tab, Renamed "survey" into
"poll" (better translation).
 2014-03-17 12:40:12 +01:00
Laurent Destailleur
b762c66c8a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-03-06 18:04:19 +01:00
Laurent Destailleur
c4c82f84c5 Fix: Typo 2014-03-06 16:41:56 +01:00
Laurent Destailleur
8f31af9825 Fix: Translation 2014-03-05 16:42:10 +01:00
KreizIT
7f275dfbf4 - Add table modification for product (forget in step 1) 
- Add module for batch number management
- change dependency for stock and product
- change product class and fiche showing new select for batch managment on product
 2014-03-04 18:55:55 +01:00
Laurent Destailleur
66a3a28eb2 Fix: Update translation guide 2014-02-28 22:51:04 +01:00
Laurent Destailleur
480b09f192 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/societe/class/societe.class.php
 2014-02-26 15:49:29 +01:00
Laurent Destailleur
63a2aa3365 Fix: sql error with postgres when creating extrafield with an upper cas 
character. code for new fields must be always lowercase.
 2014-02-25 15:48:13 +01:00
Laurent Destailleur
68058d0e4f Add a confirm box before deleting. 2014-02-23 22:24:13 +01:00
Laurent Destailleur
1685729393 New: Can reset barcode also for barcode already defined. 2014-02-20 23:09:24 +01:00
Laurent Destailleur
07ee85b097 New: Can reset barcode also for barcode already defined. 2014-02-20 22:08:32 +01:00
Laurent Destailleur
6c103f4c6b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-02-20 09:52:01 +01:00
Laurent Destailleur
0b7f623c31 New: Add an admin page to make a mass init of barcode values for all 
products.
 2014-02-19 17:04:21 +01:00
Laurent Destailleur
96e7985266 Fix: Translation of menu entries must not be into admin lang file (We 
don't want to load this file for common pages).
 2014-02-19 02:27:13 +01:00
Laurent Destailleur
03d056319c Qual: Clean code for adding menu entries into Modules system admin 
entry.
New: Add entry for admin page Mass barcode init.
 2014-02-18 20:49:22 +01:00
Laurent Destailleur
396ac5fb2b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-02-18 18:55:50 +01:00
Laurent Destailleur
c8d6a88f8a Clean xdebug page. 2014-02-17 16:30:22 +01:00
Laurent Destailleur
ff16d7446b Update translation 2014-02-14 17:54:45 +01:00
Laurent Destailleur
492dec0854 Sync from transifex 2014-02-11 23:19:22 +01:00
Laurent Destailleur
46e9b5d550 Merge branch 'develop' of https://github.com/grandoc/dolibarr into 
grandoc-develop

Conflicts:
	htdocs/langs/ar_SA/admin.lang
	htdocs/langs/el_GR/admin.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/tr_TR/admin.lang
 2014-02-10 01:30:48 +01:00
Laurent Destailleur
bd25a98e03 New: Generation auto of barcode is available for product. 2014-02-10 00:24:20 +01:00
Grand Philippe
1855ba556a fix misspelled words 2014-02-05 17:53:30 +01:00
Laurent Destailleur
ba931e18d4 Work on barcode number generation. 
Normalize code for barcode module.
 2014-01-31 18:12:54 +01:00
Laurent Destailleur
062230050f New: Can call back barcode number from a product ref or thirdparty ref. 2014-01-20 17:18:56 +01:00
Laurent Destailleur
f0151ce112 Merge remote-tracking branch 'origin/3.5' into develop 2013-12-30 12:44:46 +01:00
Laurent Destailleur
cfb791c584 Fix: Better translation 2013-12-29 19:30:11 +01:00
Laurent Destailleur
8248f63826 Fix: Missing translation 2013-12-27 20:31:57 +01:00
Laurent Destailleur
8207b7c243 Missing translation 2013-12-27 20:27:17 +01:00
Laurent Destailleur
7d6779bd4a Merge remote-tracking branch 'origin/3.5' into develop 2013-12-27 18:09:31 +01:00
Laurent Destailleur
da2f35e1a2 Fix: Missing translation. 
Fix: Title of tab not visible
 2013-12-27 17:43:52 +01:00
Marcos García de La Fuente
02036af782 Added missing translations for permissions of margins module 2013-12-08 21:18:01 +02:00