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
52,830 Commits 36 Branches 190 Tags
30aea901b8f83d4563c864abb841a3e4f7ce9e83
Commit Graph

6405 Commits

Author SHA1 Message Date
Laurent Destailleur
4567f56980 Sync from transifex 2015-07-30 17:09:18 +02:00
Laurent Destailleur
cbb2d8d800 Fix typo 2015-07-29 16:30:30 +02:00
Laurent Destailleur
ffeaa4e224 Test update checksum file 2015-07-29 15:50:59 +02:00
Laurent Destailleur
fcc6ce8c31 Fix Option for second level approbation was visible when it should 
not.
 2015-07-29 15:39:34 +02:00
Laurent Destailleur
c058437879 Fix missing translation 2015-07-29 14:50:53 +02:00
Laurent Destailleur
a6bac40f0a Fix bad translation 2015-07-29 13:03:52 +02:00
Laurent Destailleur
c2d2e06202 Fix bad glossary 2015-07-29 12:33:16 +02:00
Laurent Destailleur
a753755d75 Missing translation key 2015-07-28 19:06:49 +02:00
Laurent Destailleur
a73541194c Merge remote-tracking branch 'origin/develop' into 3.8 2015-07-28 18:57:42 +02:00
Laurent Destailleur
bdd9a6e59e Fix bad position of translation key 2015-07-28 18:14:15 +02:00
Laurent Destailleur
747e4b5e40 Fix timezone problem with external calendar import. 2015-07-28 18:12:45 +02:00
Laurent Destailleur
5ca6593a57 Fix serious deadlock feature. It was possible to link with no way to 
unlink. What if user make a bad click ? I complete feature with
reverse action to be sure to not have users with a corrupted situation.
 2015-07-28 14:13:16 +02:00
Gauthier
900c287de4 NEW : conf to use next product/service ref when we clone a product/service 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/product/admin/product.php
 2015-07-21 12:43:12 +02:00
Laurent Destailleur
99c8a9211e Sync with transifex 2015-07-20 13:55:43 +02:00
Laurent Destailleur
22ff1d7a71 Fix no space into translation key 2015-07-19 21:47:40 +02:00
Laurent Destailleur
c0146c2ce3 Fix missing translation key 2015-07-19 20:23:58 +02:00
Laurent Destailleur
cb98d6cb93 Merge remote-tracking branch 'origin/3.8' into develop 2015-07-19 15:32:20 +02:00
Laurent Destailleur
2f2b0df6f8 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/contact/exportimport.php
	htdocs/contact/info.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/core/tpl/document_actions_pre_headers.tpl.php
	htdocs/langs/fr_FR/categories.lang
	htdocs/main.inc.php
	htdocs/product/reassort.php
	htdocs/projet/list.php
	htdocs/societe/info.php
 2015-07-19 12:26:31 +02:00
Laurent Destailleur
2bb1945a2f Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/prelevement/class/rejetprelevement.class.php
	htdocs/compta/sociales/class/paymentsocialcontribution.class.php
	htdocs/contact/exportimport.php
	htdocs/contact/ldap.php
	htdocs/contact/perso.php
	htdocs/contact/vcard.php
	htdocs/core/class/commonobject.class.php
	htdocs/product/reassort.php
	htdocs/projet/liste.php
	htdocs/societe/consumption.php
	htdocs/societe/info.php
 2015-07-19 12:04:30 +02:00
Laurent Destailleur
a5ffcb50ae Update admin.lang 
More complete description of module poll.
 2015-07-19 00:32:57 +02:00
Marcos García de La Fuente
e9d1e6265d Fix: [ bug #2696 ] Adding complementary attribute fails if code is numerics 
Close #2696
 2015-07-18 14:25:05 +02:00
Laurent Destailleur
e6aca8e4d3 Traduction manquante 2015-07-16 13:51:23 +02:00
Laurent Destailleur
9e39c73f5f Better translation 2015-07-16 13:28:40 +02:00
Laurent Destailleur
a66985a279 Restore backup feature 2015-07-16 00:58:05 +02:00
aspangaro
e0b44d7954 ER: Add missing language key 2015-07-15 20:10:10 +02:00
Laurent Destailleur
db67ab0b5e Fix wrap into lang list. 
Sync with transifex
 2015-07-15 16:27:01 +02:00
Laurent Destailleur
9f6ebcd123 Sync from transifex 2015-07-15 15:56:42 +02:00
phf
bde4503abd FIX : translation for 1 word do not work if product/service module are disabled because the translation search in products.lang 2015-07-15 14:46:29 +02:00
Laurent Destailleur
3ace940505 Move trans key into main 2015-07-15 11:27:34 +02:00
Laurent Destailleur
65f11d0abb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-14 14:44:08 +02:00
Laurent Destailleur
581b6d0001 Fix: missing status on contacts 2015-07-14 11:51:27 +02:00
Laurent Destailleur
85d9d3587e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-13 16:25:43 +02:00
Laurent Destailleur
a9289de616 Several fixes. Fix #2927 2015-07-13 11:22:18 +02:00
Laurent Destailleur
0c9e984bb1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-13 10:29:45 +02:00
Laurent Destailleur
e31af7f914 Can filter list of setup constant on name and extend visibility to all. 2015-07-12 18:05:56 +02:00
Laurent Destailleur
11c94a9d3b Clean code 2015-07-12 16:50:27 +02:00
Laurent Destailleur
8690b5e70e FIX #3173 Overlapping of shipment ref 2015-07-12 16:22:06 +02:00
Laurent Destailleur
8d77667764 Bad stat report 2015-07-10 10:42:42 +02:00
aspangaro
46037dbc46 Add language key 2015-07-09 07:47:13 +02:00
Maxime Kohlhaas
9f9ba12802 New : option to allow credit note without related invoice 2015-07-08 14:32:57 +02:00
Maxime Kohlhaas
b8b337ff52 Translation 2015-07-08 14:28:40 +02:00
aspangaro
4c72567c6b Update bookkeeping 2015-07-08 07:19:23 +02:00
Laurent Destailleur
8eb4a208ce Debug statistics of project module 2015-07-05 22:04:30 +02:00
Laurent Destailleur
04ba12fab6 Add es_BO and fy_NL 2015-07-04 22:18:31 +02:00
Laurent Destailleur
1b6922fe81 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-04 18:20:34 +02:00
Laurent Destailleur
324d855b9c Still working on project module to uniformize way of working with other 
modules
 2015-07-04 18:20:17 +02:00
aspangaro
7bf1ea2cac New: Task(#2567) Add accountancy code for VAT payments 2015-07-04 15:48:43 +02:00
Laurent Destailleur
d5a4a98c22 FIX #3138 - Too much visible thing when access is denied on public pages 2015-07-04 14:56:43 +02:00
Laurent Destailleur
56560d9379 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-04 10:49:01 +02:00
Laurent Destailleur
3520c94641 Merge pull request #3131 from atm-maxime/check_rejection 
New : Check rejection management
 2015-07-04 04:20:58 +02:00