lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
60,285 Commits 43 Branches 150 Tags 886 MiB
4b4dcf2e01
Commit Graph

60285 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre SPANGARO
d0e27f67e7 Add plugins Stripe 2017-04-18 05:44:08 +02:00
Laurent Destailleur
3da0aea168 Prepare code to use different SMTP servers. 2017-04-18 01:39:06 +02:00
Laurent Destailleur
9456f7091e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-04-18 01:36:33 +02:00
Laurent Destailleur
82f9555c6b Translation 2017-04-18 01:35:58 +02:00
Laurent Destailleur
0994622bf8 NEW Can use translations into all substitutions (watermark, freetext...) 2017-04-17 23:54:09 +02:00
Alexandre SPANGARO
fed6d71d8a Merge remote-tracking branch 'uptream/develop' into 6.0-stripe 2017-04-17 06:51:02 +02:00
Laurent Destailleur
e97e202deb NEW Can import users 2017-04-17 04:22:53 +02:00
Juanjo Menent
1fd359d52d Merge pull request #6723 from rassakali/patch-3 
Update /adherents/subscription/card.php
 2017-04-16 14:14:12 +02:00
Juanjo Menent
9bbfeed1bc Merge pull request #6722 from Christian-Seiler/3.9 
Fix #5911 Added missing Slashes
 2017-04-16 12:23:52 +02:00
rassakali
e1ea6e2b53 Update card.php 2017-04-16 12:04:36 +02:00
fappels
cbfd18be24 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop 2017-04-16 11:31:11 +02:00
Christian Seiler
e23a44bcdf Added missing Slashes 
fixed line where two slashes were missing, that caused an error when creating barcodes.
 2017-04-16 11:09:18 +02:00
Juanjo Menent
3a8608db19 Merge pull request #6697 from atm-maxime/fix_supp_prop_subprice 
Fix Subprice was null in supplier proposal and line was not transfered to…
 2017-04-16 11:08:41 +02:00
Juanjo Menent
c8b0921c51 Merge pull request #6702 from joseplluis/patch-7 
NEW Show local taxes in supplier facture list
 2017-04-16 11:05:19 +02:00
Juanjo Menent
3308775c06 Merge pull request #6701 from joseplluis/patch-6 
NEW Show local taxes in facture list
 2017-04-16 11:03:59 +02:00
Juanjo Menent
f000ca23c3 Merge pull request #6721 from simnandez/5.0 
FIX #6718 Bug: Discount amount is not locally formatted in CommonObject View
 2017-04-16 10:45:55 +02:00
Juanjo Menent
f059ab0042 Merge pull request #6711 from atm-maxime/fix_stockmvt_origin 
Fix : no origin on stock mvmt when order set back to draft
 2017-04-16 10:31:45 +02:00
Juanjo Menent
2413c728a8 Merge pull request #6710 from atm-maxime/fix_bank_on_supp_pay 
Fix : display bank on supplier payment as on customer payment
 2017-04-16 10:29:25 +02:00
Juanjo Menent
2fb96c8817 Merge pull request #6708 from atm-florian/5.0_fixmissingaccountancy_mainmenu 
fix :missing mainmenu and leftmenu into accoutancy menu descriptor
 2017-04-16 10:22:03 +02:00
Juanjo Menent
00390bc8e4 Merge pull request #6705 from atm-florian/5.0 
fix setEventMessages error insteads of errors
 2017-04-16 10:19:19 +02:00
Juanjo Menent
006ad4cef8 FIX #6718 Bug: Discount amount is not locally formatted in CommonObject View 2017-04-15 20:04:45 +02:00
Laurent Destailleur
4c056d68d8 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/commande/list.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/bills.lang
	htdocs/societe/list.php
 2017-04-15 17:02:05 +02:00
Laurent Destailleur
ac884ec463 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/install/repair.php
 2017-04-15 16:28:08 +02:00
Laurent Destailleur
d2173c1fa4 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-04-15 16:24:42 +02:00
Laurent Destailleur
7fe66581f1 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-04-15 16:24:30 +02:00
Laurent Destailleur
72ff353e9f Fix repair of product_stock 2017-04-15 16:22:15 +02:00
Laurent Destailleur
2e759d5156 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2017-04-15 16:19:02 +02:00
Laurent Destailleur
086fa4385f Fix clean of product_batch 2017-04-15 16:17:22 +02:00
rassakali
f68c408dbc Update subscription.php 
Fix issue #6694
 2017-04-15 08:35:23 +02:00
Laurent Destailleur
4490477cfb Fix scrutinizer warning 2017-04-15 03:14:31 +02:00
Laurent Destailleur
7354cb148a Fix scrutinizer 2017-04-15 03:13:17 +02:00
Laurent Destailleur
d99de641e8 Fic on vat npr 2017-04-15 03:06:25 +02:00
Laurent Destailleur
1e4dd5d095 Fix bug reported by scrutinizer 2017-04-15 03:05:04 +02:00
Laurent Destailleur
b0442aa56a Better explanation on label that are translated. 2017-04-14 19:48:01 +02:00
Laurent Destailleur
cbc6684ea7 Fix error management 2017-04-14 18:59:01 +02:00
Laurent Destailleur
e2c31b5f23 Fix regression 2017-04-14 18:43:34 +02:00
Laurent Destailleur
436f60a784 FIX Cache to load currencies was not working when loading all currencies 2017-04-14 18:08:02 +02:00
Laurent Destailleur
8c07f514c8 Add php unit tests on expense reports 2017-04-14 16:51:30 +02:00
Laurent Destailleur
db73eeba5c NEW Can filter on code in dictionnaries 2017-04-14 16:31:16 +02:00
Laurent Destailleur
12ca11e2fa Fix regression 2017-04-14 15:42:58 +02:00
Maxime Kohlhaas
402924f6d7 Fix : no origin on stock mvmt when order set back to draft 2017-04-14 15:12:32 +02:00
Maxime Kohlhaas
6c5b329dd1 Fix : display bank on supplier payment as on customer payment 2017-04-14 14:51:39 +02:00
Laurent Destailleur
c7160ad2b9 Avoid warning 2017-04-14 14:19:21 +02:00
Laurent Destailleur
62394abb8b Introduce skeleton for a collab module. Volunteer wanted. 2017-04-14 14:11:52 +02:00
Laurent Destailleur
aef3592698 Fix travis 2017-04-14 13:56:26 +02:00
Laurent Destailleur
5931bc4068 NEW Feature to crop/resize images available on user and expense reports 2017-04-14 13:53:39 +02:00
Laurent Destailleur
846204bdb4 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 13:02:29 +02:00
Laurent Destailleur
c52f4644e1 Look and feel v6 2017-04-14 13:00:39 +02:00
Laurent Destailleur
aabfc2f0db Perf. Do not load personal conf of user by default. 2017-04-14 12:52:32 +02:00
Laurent Destailleur
4818b1ba44 Load default values into $user->default_values 2017-04-14 12:39:11 +02:00