Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
58,869 Commits 36 Branches 189 Tags
586ea54bfcbb0305fc3480965337f2d9ca2a4e7f
Commit Graph

4734 Commits

Author SHA1 Message Date
Laurent Destailleur
c722286bcb Fix regressions 2017-04-28 13:37:36 +02:00
Laurent Destailleur
cfde27820e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/translation.php
	htdocs/comm/card.php
	htdocs/core/menus/standard/eldy.lib.php
 2017-04-27 17:20:40 +02:00
Laurent Destailleur
0080821dc5 Fix no invoice if not a customer 2017-04-23 16:05:54 +02:00
Philippe Grand
c18e7e8816 Merge branch 'develop' into testing 2017-04-19 11:27:36 +02:00
Philippe Grand
529ae1fa92 Update propal.class.php 2017-04-19 10:01:43 +02:00
Laurent Destailleur
3da0aea168 Prepare code to use different SMTP servers. 2017-04-18 01:39:06 +02:00
Laurent Destailleur
0994622bf8 NEW Can use translations into all substitutions (watermark, freetext...) 2017-04-17 23:54:09 +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
846204bdb4 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 13:02:29 +02:00
Laurent Destailleur
39ebaec064 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
Laurent Destailleur
a6b05bb4da Merge branch '5.0' of github.com:Dolibarr/dolibarr into 5.0 2017-04-12 14:08:58 +02:00
Laurent Destailleur
26a9999fbf Support of preview for pdf with several pages 2017-04-12 11:38:55 +02:00
philippe grand
06c91cdaf2 ref column was missing for specimen and some update 2017-04-11 14:47:11 +02:00
Laurent Destailleur
6aa56ce0fa NEW Add a tracking id into mass emailing 
Prepare code to use a dedicated SMTP server according to context.
 2017-04-11 10:57:17 +02:00
Laurent Destailleur
9b45776941 Fix responsive 2017-04-10 17:25:53 +02:00
Laurent Destailleur
52c86cb3f5 NEW Bulk actions available on supplier orders 2017-04-09 13:12:25 +02:00
Laurent Destailleur
be439f6252 Work on look and feel v6 2017-04-07 16:16:44 +02:00
Laurent Destailleur
60a54041c2 NEW Enable bulk actions delete on supplier invoices 2017-04-07 14:09:19 +02:00
Widee
89716a86a5 Avoid (DEPOSIT) (1) & (2) descriptions 
When splitting a rebate into two parts, the word "DEPOSIT" is no longer translated on the invoices.
 2017-04-04 12:22:51 +02:00
Laurent Destailleur
d99b0461c7 Extrafields multilanguage support. 2017-04-03 10:56:28 +02:00
Laurent Destailleur
e221c48997 Css 2017-04-01 00:59:21 +02:00
Laurent Destailleur
7254b54a04 Work on 6.0 look and feel 2017-04-01 00:49:06 +02:00
Laurent Destailleur
93687997c9 Work on 6.0 look and feel 2017-03-31 18:40:53 +02:00
Laurent Destailleur
7056edf509 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-31 18:32:36 +02:00
Laurent Destailleur
6e0918dded Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-03-31 18:31:54 +02:00
Laurent Destailleur
911d5832c6 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-03-31 18:30:41 +02:00
Laurent Destailleur
b44143d24d Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2017-03-31 18:29:15 +02:00
Laurent Destailleur
01a74a8d23 Work on 6.0 look and feel 2017-03-31 17:41:20 +02:00
Laurent Destailleur
da1427ef54 Work on 6.0 look and feel 2017-03-30 16:10:08 +02:00
Laurent Destailleur
54b03a3552 Work on 6.0 new look and feel 2017-03-29 11:03:13 +02:00
Laurent Destailleur
e416ea275e Work on 6.0 look and feel 2017-03-28 21:04:38 +02:00
Laurent Destailleur
3740137e31 Add tooltip on label of each open item. 2017-03-28 10:44:52 +02:00
Laurent Destailleur
f843f8a93d Start to move search bar before table titles 2017-03-27 00:48:50 +02:00
BENKE Charlie
f4a7217f20 display total line for all total line 2017-03-26 01:49:48 +01:00
Laurent Destailleur
106d19a8af FIX #6468 + Fix missing translation 2017-03-25 03:53:11 +01:00
Laurent Destailleur
aa9d991923 Fix css 2017-03-25 01:03:02 +01:00
BENKE Charlie
94a1fc19fa display total line for all total line 2017-03-24 23:39:25 +01:00
Laurent Destailleur
38660418b4 Include preview of pdf into dol_banner 2017-03-23 22:27:44 +01:00
Laurent Destailleur
3adb43c6e5 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/boxes/box_produits.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/langs/en_US/bills.lang
	htdocs/product/class/product.class.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
 2017-03-23 12:52:19 +01:00
Laurent Destailleur
7df9c25e60 Several fixes on multicurrency 2017-03-23 12:44:20 +01:00
Laurent Destailleur
b9a9997688 Page societe/soc.php and compta/facture.php was renamed into card.php 
to match page naming conventions.
 2017-03-20 21:29:22 +01:00
Laurent Destailleur
888675016d NEW Can use dol_fiche_end without showing bottom border. 2017-03-15 11:13:30 +01:00
Laurent Destailleur
7f8c4d7d0f Fix CSS 2017-03-14 14:33:25 +01:00
hugome
38ccf7ffdd Fix : Agenda getCalendarEvents hook 
Return of getCalendarEvents on agenda page :
The array_merge change key of merged array.
 2017-03-13 11:35:49 +01:00
Laurent Destailleur
4bf0e31299 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/loan.lang
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
 2017-03-11 02:40:42 +01:00
Laurent Destailleur
47dd53abbe NEW The substitution keys available for emailing edition is now into a 
popup
 2017-03-11 02:36:22 +01:00
Laurent Destailleur
30c2ac37d5 Fix missing separator 2017-03-11 02:35:01 +01:00
Laurent Destailleur
618c27d63c Optimize space 2017-03-10 16:26:43 +01:00
Laurent Destailleur
184d52525a PHP code to manage pair/impair is replaced by native CSS. 2017-03-07 22:45:22 +01:00
Laurent Destailleur
5f79b2d0c6 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/accountancy/admin/categories.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2017-03-05 22:11:35 +01:00