lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
69,227 Commits 43 Branches 150 Tags 886 MiB
9d9e2bc3e3
Commit Graph

8334 Commits

Author SHA1 Message Date
Laurent Destailleur
9d9e2bc3e3
Merge pull request #9405 from fmarcet/develop 
NEW: Highlight lines on lists when they are checked
 2018-09-12 20:50:42 +02:00
Laurent Destailleur
88192d1bae
Merge pull request #9456 from frederic34/stripeuser 
add stripe user for actions
 2018-09-12 18:37:31 +02:00
Laurent Destailleur
e89ff94d74
Update stripe.lang 2018-09-12 18:35:47 +02:00
Laurent Destailleur
f5074f4962 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-12 18:12:17 +02:00
Laurent Destailleur
77d7c97750 Fix typo 2018-09-12 17:18:27 +02:00
Laurent Destailleur
48ae4de47b FIX Add paypal error message in alert email 2018-09-12 16:11:10 +02:00
Laurent Destailleur
fcabe67e4b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-12 13:30:28 +02:00
Frédéric FRANCE
5f1b3fbc12
add stripe user for actions 2018-09-10 20:18:16 +02:00
Laurent Destailleur
3de8381c20 Website module 2018-09-10 19:36:46 +02:00
Laurent Destailleur
538a2cc647 NEW Add first template of website 2018-09-08 13:55:15 +02:00
Laurent Destailleur
a2b71d9a7a NEW Can delete a website in experimental website module 2018-09-08 12:04:40 +02:00
Laurent Destailleur
0ef17fe581 FIX Problems with permissions of module to record payment of salaries 2018-09-07 13:32:56 +02:00
Laurent Destailleur
c5695db3e4 NEW Can disable meteo on smartphone only 2018-09-06 11:09:51 +02:00
Laurent Destailleur
4ac67e6409 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-05 20:31:10 +02:00
Laurent Destailleur
e3339f5f95 Fix trad 2018-09-05 19:01:00 +02:00
Laurent Destailleur
ab8155f170 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php
 2018-09-04 21:35:43 +02:00
Ferran Marcet
b658626e21 NEW: Highlight lines on lists when they are checked 2018-09-04 11:54:13 +02:00
Laurent Destailleur
9697bdf3b0 FIX #9393 inconsistency behaviour. option FACTURE_ENABLE_NEGATIVE_LINES 2018-09-04 10:38:09 +02:00
Laurent Destailleur
3d3edb19d8 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/langs/en_US/commercial.lang
 2018-09-02 15:48:26 +02:00
Laurent Destailleur
df26ae764e Fix typo 2018-09-01 17:56:52 +02:00
Laurent Destailleur
dfda029da4 FIX a removed option was still in setup 2018-09-01 17:44:07 +02:00
Laurent Destailleur
bcee0ef0ae Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/societe/class/societe.class.php
	htdocs/stripe/config.php
 2018-09-01 14:16:57 +02:00
Laurent Destailleur
26cff9e11f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/langs/en_US/blockedlog.lang
	htdocs/stripe/config.php
 2018-09-01 14:13:01 +02:00
Laurent Destailleur
4d22c4f9f9 Typo 2018-08-30 11:37:06 +02:00
Frédéric FRANCE
285e231ea1
Update blockedlog.lang 2018-08-29 23:08:13 +02:00
Laurent Destailleur
2cf37f621c
Merge pull request #9267 from torvista/develop 
Installer: set protocol of autofill of main url to match installer protocol
 2018-08-29 21:47:31 +02:00
Laurent Destailleur
3ebfb23407 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/product/fournisseurs.php
	htdocs/ticket/class/ticket.class.php
 2018-08-29 20:22:50 +02:00
Laurent Destailleur
1b542d5be3 Fix translation 2018-08-28 18:36:46 +02:00
Laurent Destailleur
b5c2383f65 Fix type of invoice encoded twice 2018-08-28 18:34:53 +02:00
Laurent Destailleur
d2d28ab109 Fix trans 2018-08-28 18:28:09 +02:00
Laurent Destailleur
bc31fa7fbf Fix translation 2018-08-28 18:18:04 +02:00
Laurent Destailleur
bbc6255925 Fix missing language 2018-08-28 13:07:48 +02:00
Steve
6ecc6b8b48
Merge pull request #1 from Dolibarr/develop 
update fork
 2018-08-28 00:10:26 +02:00
Laurent Destailleur
36c7007aaa Add control to avoid duplicate aliases 2018-08-20 19:10:33 +02:00
Laurent Destailleur
26d34422b0 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-19 03:01:26 +02:00
Laurent Destailleur
cca0f4bf22 Fix translation 2018-08-19 02:01:18 +02:00
Laurent Destailleur
38f3452f0c Fix trans 2018-08-19 01:51:45 +02:00
torvista
710ce6a9f7 Add description to database prefix field to avoid confusion when not specifying a database prefix. 2018-08-19 00:09:34 +02:00
Laurent Destailleur
9a82cc3261 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-18 02:55:49 +02:00
Laurent Destailleur
dedfd6d493 Fix missing translation 2018-08-18 02:55:22 +02:00
Laurent Destailleur
ab22c9d0de Work on import 2018-08-16 21:48:16 +02:00
Laurent Destailleur
4e02b134da Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2018-08-16 14:50:04 +02:00
Laurent Destailleur
9f5cc2d05f Fix menu entry 2018-08-16 10:33:20 +02:00
Laurent Destailleur
1922c3d881 Fix menu entry 2018-08-16 10:32:42 +02:00
Laurent Destailleur
2a69fa39d6 error message 2018-08-16 00:18:08 +02:00
Laurent Destailleur
4610b193bb Add error message 2018-08-16 00:13:13 +02:00
Laurent Destailleur
ae9867eead Work on website import 2018-08-16 00:03:19 +02:00
Laurent Destailleur
ec56ad752c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2018-08-15 14:26:38 +02:00
Laurent Destailleur
b88c657a4a Work on website import 2018-08-15 14:24:33 +02:00
Laurent Destailleur
df57bd176b Fix translation 2018-08-13 14:53:04 +02:00