lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
57,413 Commits 43 Branches 150 Tags 886 MiB
0bac99028e
Commit Graph

57413 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
0bac99028e Merge pull request #6276 from aljawaid/develop 
Fix: Add Missing Translation String
 2017-01-16 00:43:00 +01:00
Laurent Destailleur
d95ac3bbdd Fix warning 2017-01-16 00:16:20 +01:00
Laurent Destailleur
4ecd657f34 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-16 00:02:43 +01:00
Laurent Destailleur
0671f75417 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-01-16 00:01:37 +01:00
Laurent Destailleur
0fe844aa00 FIX usage of tag {y} in numbering modules 2017-01-16 00:01:06 +01:00
Laurent Destailleur
7bccaff28a Fix remove warnings 2017-01-15 23:32:14 +01:00
Laurent Destailleur
54a974cb5c Fix position of dropdown tooltip 2017-01-15 21:03:44 +01:00
Laurent Destailleur
d14e4dbaba Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on 2017-01-15 20:49:20 +01:00
IJ
79714f7ede Merge pull request #2 from aljawaid/aljawaid-patch-4 
Fix: Add Missing Translation String
 2017-01-15 11:06:51 +00:00
IJ
d5120ae7cc Fix: Add Missing Translation String 
When product batch module is disabled, the translation string is missing for dispatch line.
 2017-01-15 11:04:32 +00:00
Laurent Destailleur
1fd9f5e1fb Fix: host was twice into message id for smtp driver and swiftmailer was 
not using dol_getprefix() to build host.
 2017-01-14 13:27:44 +01:00
Laurent Destailleur
6aa26e0f62 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/product/stock/massstockmove.php
	htdocs/projet/info.php
	htdocs/projet/tasks/time.php
	htdocs/societe/class/societe.class.php
 2017-01-13 16:49:18 +01:00
Laurent Destailleur
29f07d3e89 The tutorial to add cron is sometimes false. Quick hack for a solution 
to hide it.
 2017-01-13 16:39:35 +01:00
Laurent Destailleur
31818e8816 Fix missing translation 2017-01-13 15:32:20 +01:00
Laurent Destailleur
3a2f44adac Fix security permissions to edit/delete time spent 2017-01-13 14:24:39 +01:00
Laurent Destailleur
380b61a0e9 FIX Can make a stock transfert on product not on sale/purchase. 2017-01-12 21:56:50 +01:00
Laurent Destailleur
c3e5e0dd3f Update doc 2017-01-12 21:50:35 +01:00
Laurent Destailleur
edb79de54e FIX javascript error 2017-01-12 18:07:19 +01:00
Laurent Destailleur
32a453e8e6 Fix label combo 2017-01-12 15:44:20 +01:00
Laurent Destailleur
f185a09693 FIX Security access problem with external users on projects/tasks 2017-01-12 15:26:00 +01:00
Laurent Destailleur
8d5c853267 FIX Protection so even if link is output for external user, links is 
disabled.
 2017-01-12 15:12:53 +01:00
Laurent Destailleur
13787881d4 Fix css 2017-01-12 11:46:13 +01:00
Laurent Destailleur
4349eac7ea Merge pull request #6225 from aspangaro/5.0-18 
Expense report - Better presentation - return lines order by date
 2017-01-12 11:37:31 +01:00
Laurent Destailleur
9671810d13 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-12 11:33:25 +01:00
Laurent Destailleur
2c6672d17a Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/login.tpl.php
 2017-01-12 11:32:51 +01:00
Laurent Destailleur
b28ba7a5ff Merge pull request #6252 from gnovaro/develop 
Improve cashdesk code style. Ticket now have ticket.css file
 2017-01-12 11:31:51 +01:00
Laurent Destailleur
32a3f74ea1 Merge pull request #6108 from defrance/patch-51 
NEW Can send contract by mail from contract card
 2017-01-12 11:26:44 +01:00
Laurent Destailleur
4d134a4a4e Merge pull request #6085 from defrance/patch-49 
NEW Extend option PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES to change supplier ref display mode in PDF
 2017-01-12 11:19:54 +01:00
Laurent Destailleur
25dcb10c1d Merge pull request #6066 from atm-florian/dev_exportthirdparty 
NEW : Can export thirdparty with sale representative that is a subordinate (Need hidden option SOCIETE_EXPORT_SUBORDINATES_CHILDS)
 2017-01-12 11:17:15 +01:00
Laurent Destailleur
0548e9cc4e Merge pull request #6226 from aspangaro/5.0-19 
NEW Expense report now send email on different validatin steps (Remove DEPLACEMENT_TO_CLEAN)
 2017-01-12 11:15:14 +01:00
Laurent Destailleur
e82aa97d0e Merge pull request #6266 from simnandez/4.0 
FIX #6245 Thirdparty link in supplier invoices list, links to "comm/card" instead of "fourn/card" page
 2017-01-12 11:13:14 +01:00
Laurent Destailleur
64b932f78c Merge pull request #6261 from GPCsolutions/travis-php7.1 
[Qual] Add PHP 7.1 to Travis test matrix
 2017-01-12 11:12:25 +01:00
Laurent Destailleur
c42b48636a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/commande/class/api_commande.class.php
	htdocs/core/class/CMailFile.class.php
	htdocs/societe/class/api_contact.class.php
 2017-01-12 11:06:24 +01:00
Laurent Destailleur
762dd8030e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-01-12 10:59:41 +01:00
Laurent Destailleur
7476a3c8ae Fix error during migration 2017-01-12 10:59:27 +01:00
Laurent Destailleur
e802ff3385 Fix POO declaration 2017-01-12 10:57:15 +01:00
Laurent Destailleur
5e71ff816f Increase limit for better backward compatibility without loosing minimum 
security.
 2017-01-12 10:51:31 +01:00
Laurent Destailleur
351c416ed8 Merge pull request #6265 from hregis/4.0_bug 
Fix: avoid errors if constants values not exists
 2017-01-12 10:49:23 +01:00
Laurent Destailleur
721534d676 Merge pull request #6264 from atm-florian/5.0 
fix : warehouse creation failed with mysql 5.7 (string 'NULL' instead of "NULL")
 2017-01-12 10:39:13 +01:00
Laurent Destailleur
97f71d33ce Merge pull request #6263 from aspangaro/6.0-1 
New : Loan - Edit mode more complete
 2017-01-12 10:35:42 +01:00
Laurent Destailleur
f408c886b6 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-01-12 10:16:32 +01:00
Laurent Destailleur
3d8c5b377b Fix string not translated 2017-01-12 10:16:19 +01:00
Laurent Destailleur
29a8c8105e Merge pull request #6258 from aljawaid/patch-1 
Fix: User-friendly Tooltip
 2017-01-12 10:12:51 +01:00
Laurent Destailleur
46e330f749 Merge pull request #6256 from aspangaro/5.0-23 
Fix : Bank - Presentation, no titlefield in a list
 2017-01-12 10:09:38 +01:00
Laurent Destailleur
7a8a95c815 Merge pull request #6249 from KiteAtao/4.0 
Fix #6247 #6248 Contact and Commands REST WebServices failed
 2017-01-12 10:08:32 +01:00
Laurent Destailleur
4ea78d20f0 Merge pull request #6251 from aspangaro/5.0-22 
Fix : Bank - Missing language file
 2017-01-12 10:06:42 +01:00
Laurent Destailleur
14fb01da11 Merge pull request #6250 from gnovaro/patch-6 
Bug: Fix missing ,
 2017-01-12 10:06:01 +01:00
Laurent Destailleur
749f8cf252 Fix translation 2017-01-12 00:15:00 +01:00
Laurent Destailleur
94f14f529b Fix pb with double quote 2017-01-11 22:02:08 +01:00
Juanjo Menent
bcba4a1a38 FIX #6253 Supplier invoice list filter does not respect "thirdparty" filter 2017-01-11 20:48:32 +01:00