Laurent Destailleur
|
8d33a6947b
|
Merge pull request #2105 from frederic34/patch-11
Fix 1733 Homepage boxes close button translation error
|
2014-11-27 21:51:00 +01:00 |
|
Laurent Destailleur
|
d4ac3c96dd
|
Merge pull request #2108 from frederic34/patch-14
Update Order Preview
|
2014-11-27 21:50:21 +01:00 |
|
Laurent Destailleur
|
6f3dde8a9b
|
Merge pull request #2109 from frederic34/patch-15
Update Invoice Preview
|
2014-11-27 21:50:09 +01:00 |
|
Laurent Destailleur
|
8a8f9aaee3
|
Merge pull request #2106 from frederic34/patch-12
Fix 1655 Proposal amount not computed in preview
|
2014-11-27 21:49:43 +01:00 |
|
Frédéric FRANCE
|
6483b34d0d
|
Update apercu.php
|
2014-11-27 21:03:51 +01:00 |
|
Frédéric FRANCE
|
f769295999
|
Update apercu.php
|
2014-11-27 21:03:01 +01:00 |
|
Frédéric FRANCE
|
950fad9227
|
Update apercu.php
|
2014-11-27 17:49:48 +01:00 |
|
jfefe
|
1b35c5e77b
|
Missing extrafields management for order webservice
|
2014-11-27 12:56:10 +01:00 |
|
Frédéric FRANCE
|
755732ce58
|
Update apercu.php
|
2014-11-26 20:35:08 +01:00 |
|
Frédéric FRANCE
|
96e0ecd1a7
|
Update Invoice Preview
|
2014-11-26 20:07:47 +01:00 |
|
Frédéric FRANCE
|
238b139274
|
Update apercu.php
|
2014-11-26 19:52:38 +01:00 |
|
Frédéric FRANCE
|
2ee55a39fd
|
Update ecm.lib.php
|
2014-11-26 18:35:16 +01:00 |
|
Frédéric FRANCE
|
2a25f990ac
|
Fix 1660 ECM tabs help tooltips not showing
|
2014-11-26 18:33:03 +01:00 |
|
Frédéric FRANCE
|
e179e7d5a5
|
Fix 1655 Proposal amount not computed in preview
|
2014-11-26 17:24:26 +01:00 |
|
Frédéric FRANCE
|
90b582b1f3
|
Fix 1733 Homepage boxes close button translation error
In french : Close -> Clotûrer (Close a propal)
Close2 ->Fermer (Close a window)
|
2014-11-26 16:58:54 +01:00 |
|
Frédéric FRANCE
|
ebc0f842fc
|
Rearrange Help Block in left menu
|
2014-11-26 16:48:37 +01:00 |
|
aspangaro
|
38d94bac33
|
Correct login page
|
2014-11-25 21:47:08 +01:00 |
|
Francis Appels
|
b1a4b8e7d0
|
Fix: [ bug #1624 ] POS set buy price for margin
Use lowest buying price for margin when selling with POS or external
module. A POS user does not worry about suppliers.
|
2014-11-25 21:20:13 +01:00 |
|
aspangaro
|
559bf93acb
|
Correct
|
2014-11-25 20:40:00 +01:00 |
|
aspangaro
|
c4c69e191b
|
Replace <center> tags
|
2014-11-25 20:13:43 +01:00 |
|
Frédéric FRANCE
|
fbdd851875
|
Fix remove </a> not needed
|
2014-11-25 18:54:56 +01:00 |
|
Francis Appels
|
18406fc550
|
Fix: Show sender Country on PDF docs
Show sender Country on PDF docs when sender Country != receiver Country
|
2014-11-25 14:26:45 +01:00 |
|
Frédéric FRANCE
|
911f9c0913
|
Fix Typo
|
2014-11-25 01:13:52 +01:00 |
|
Frédéric FRANCE
|
e4517ee0f4
|
Fix Typo
|
2014-11-25 01:07:45 +01:00 |
|
Frédéric FRANCE
|
9fb58e06f6
|
Fix Typo
|
2014-11-25 01:06:55 +01:00 |
|
Frédéric FRANCE
|
6163635d7c
|
Fix Typo
|
2014-11-25 01:06:04 +01:00 |
|
Frédéric FRANCE
|
9d813b25d9
|
Fix Typo
|
2014-11-25 01:05:01 +01:00 |
|
Frédéric FRANCE
|
f5bc6dc634
|
Update propal.php
|
2014-11-24 21:01:55 +01:00 |
|
Frédéric FRANCE
|
81f467661e
|
Update propal.php
|
2014-11-24 20:58:46 +01:00 |
|
Frédéric FRANCE
|
655dc35628
|
Update propal.php
|
2014-11-24 20:57:26 +01:00 |
|
Frédéric FRANCE
|
5dbba380d2
|
Fix 1721 Missing translation on proposal creation
|
2014-11-24 20:54:38 +01:00 |
|
Laurent Destailleur
|
ab25b149c5
|
Fix: Download of user files
|
2014-11-24 15:40:40 +01:00 |
|
Marcos García de La Fuente
|
082f67a6e4
|
Fixed [ bug #1718 ] Mistakenly searching for text in amount field breaks
|
2014-11-24 12:49:33 +01:00 |
|
Marcos García de La Fuente
|
d9958efcd7
|
Fixed [ bug #1691 ] Don't think the ID should be displayed in holiday module
|
2014-11-24 12:45:46 +01:00 |
|
Laurent Destailleur
|
1dbb19e8ef
|
Merge pull request #2058 from defrance69/patch-30
Update objectline_create.tpl.php
|
2014-11-24 10:57:14 +01:00 |
|
aspangaro
|
ef991e6c5d
|
HTML5 - <center> is deprecated - Need CSS - continue working
|
2014-11-24 06:43:15 +01:00 |
|
Laurent Destailleur
|
bc1d88d324
|
Fixed: The visualization of status with mutualized picto was lost, so i
restore old feature to keep same visual for all status and add hidden
option to switch to new.
|
2014-11-24 01:16:26 +01:00 |
|
Laurent Destailleur
|
29bfe7050d
|
Fix: W3C.
|
2014-11-24 01:11:30 +01:00 |
|
Marcos García de La Fuente
|
3ab8cff641
|
Removed unused action of card.php
|
2014-11-24 01:09:11 +01:00 |
|
Marcos García de La Fuente
|
6304895d75
|
Fixed typo
|
2014-11-24 01:05:18 +01:00 |
|
Marcos García de La Fuente
|
601710a4dc
|
Highlight of required fields should be only in edit mode
Conflicts:
htdocs/bookmarks/card.php
|
2014-11-24 01:05:01 +01:00 |
|
Laurent Destailleur
|
9b9e6403ae
|
Merge pull request #2081 from marcosgdf/bookmarks
Fixed several problems with bookmarks page
|
2014-11-24 01:02:31 +01:00 |
|
Marcos García de La Fuente
|
6159591a02
|
Fixed [ bug #1679 ] Can't sort groups by user count in user groups list
|
2014-11-24 01:01:33 +01:00 |
|
Laurent Destailleur
|
dc63388746
|
Merge pull request #2082 from marcosgdf/bug-1679
Fixed [ bug #1679 ] Can't sort groups by user count in user groups list
|
2014-11-24 01:01:07 +01:00 |
|
Laurent Destailleur
|
00031cbdab
|
Merge pull request #2085 from frederic34/patch-2
Put label into div
|
2014-11-24 00:59:38 +01:00 |
|
Laurent Destailleur
|
ca1a21012e
|
Merge pull request #2086 from aspangaro/3.7-patch1
Patch module resource
|
2014-11-24 00:58:41 +01:00 |
|
Laurent Destailleur
|
891e39189a
|
Fixed: missing css class
|
2014-11-23 23:31:35 +01:00 |
|
Laurent Destailleur
|
7a18240d2f
|
Doxygen
|
2014-11-23 23:22:49 +01:00 |
|
aspangaro
|
bbdd25f97c
|
Add function purge criteria in project module
|
2014-11-23 21:37:45 +01:00 |
|
aspangaro
|
aa8c165f06
|
Presentation
|
2014-11-23 21:03:34 +01:00 |
|
Frédéric FRANCE
|
6cc79c2dd7
|
Put label into div
|
2014-11-23 18:42:48 +01:00 |
|
Laurent Destailleur
|
6d2e024d52
|
Doxygen
|
2014-11-23 17:53:44 +01:00 |
|
Laurent Destailleur
|
e3710bb61a
|
Merge pull request #2084 from frederic34/patch-3
Fix Typo
|
2014-11-23 17:47:55 +01:00 |
|
Laurent Destailleur
|
3f655154c5
|
Merge pull request #2083 from frederic34/patch-2
Fix Typo
|
2014-11-23 17:47:43 +01:00 |
|
Laurent Destailleur
|
c3b62ce201
|
Merge remote-tracking branch 'origin/3.7' into develop
|
2014-11-23 17:46:57 +01:00 |
|
Frédéric FRANCE
|
979d6dffa2
|
Update /compta/paiement/cheque/list.php
|
2014-11-23 17:45:18 +01:00 |
|
Frédéric FRANCE
|
ba7500a504
|
Update /fourn/facture/impayees.php
|
2014-11-23 17:45:14 +01:00 |
|
Frédéric FRANCE
|
0384f90607
|
Update /fourn/facture/paiement.php
|
2014-11-23 17:45:11 +01:00 |
|
Frédéric FRANCE
|
afc87f5445
|
Update /fourn/commande/list.php
|
2014-11-23 17:45:07 +01:00 |
|
Frédéric FRANCE
|
99e88c16c4
|
Update /product/stock/mouvement.php
|
2014-11-23 17:45:04 +01:00 |
|
Frédéric FRANCE
|
01e6d9fc12
|
Update /comm/prospect/list.php
|
2014-11-23 17:45:00 +01:00 |
|
Frédéric FRANCE
|
627e3e0a2b
|
Update /comm/actions/listactions.php
|
2014-11-23 17:44:57 +01:00 |
|
Frédéric FRANCE
|
199239ac8b
|
Update /accountancy/bookeeping/list.php
|
2014-11-23 17:44:53 +01:00 |
|
Frédéric FRANCE
|
b6824877e5
|
Update /accountancy/admin/account.php
|
2014-11-23 17:44:49 +01:00 |
|
Frédéric FRANCE
|
339415034e
|
Update /compta/facture/impayees.php
|
2014-11-23 17:44:45 +01:00 |
|
Frédéric FRANCE
|
ccff0f0952
|
Update /compta/facture/list.php
|
2014-11-23 17:44:41 +01:00 |
|
Frédéric FRANCE
|
9b731753e7
|
Update /compta/salaries/index.php
|
2014-11-23 17:44:37 +01:00 |
|
Frédéric FRANCE
|
fa89e310ae
|
Update /compta/paiement/list.php
|
2014-11-23 17:44:33 +01:00 |
|
Frédéric FRANCE
|
dd1c39b44e
|
Update /compta/bank/search.php
|
2014-11-23 17:44:29 +01:00 |
|
Frédéric FRANCE
|
2a79c2c826
|
Update /compta/sociales/index.php
|
2014-11-23 17:44:25 +01:00 |
|
Frédéric FRANCE
|
59494db8c1
|
Update /compta/tva/reglement.php
|
2014-11-23 17:44:21 +01:00 |
|
Frédéric FRANCE
|
8c839cc2a1
|
Update /compta/prelevement/list.php
|
2014-11-23 17:44:16 +01:00 |
|
Frédéric FRANCE
|
68ccb33def
|
Update /compta/deplacement/list.php
|
2014-11-23 17:44:13 +01:00 |
|
Frédéric FRANCE
|
045c2f9568
|
Update /compta/dons/list.php
|
2014-11-23 17:44:08 +01:00 |
|
Frédéric FRANCE
|
64497de4d8
|
Update /societe/societe.php
|
2014-11-23 17:44:04 +01:00 |
|
Frédéric FRANCE
|
62876cc022
|
Update /societe/consumption.php
|
2014-11-23 17:44:01 +01:00 |
|
Frédéric FRANCE
|
e7f9b9bf1b
|
Update /adherents/list.php
|
2014-11-23 17:43:57 +01:00 |
|
Frédéric FRANCE
|
f6db1d5da2
|
Update /fourn/list.php
|
2014-11-23 17:43:52 +01:00 |
|
Frédéric FRANCE
|
d57344a2e7
|
Update /contrat/list.php
|
2014-11-23 17:43:48 +01:00 |
|
Frédéric FRANCE
|
c97e95f6ab
|
Update /contrat/services.php
|
2014-11-23 17:43:44 +01:00 |
|
Frédéric FRANCE
|
84d3bd2b43
|
Update /expedition/list.php
|
2014-11-23 17:43:40 +01:00 |
|
Frédéric FRANCE
|
b396ccaf73
|
Update /fichinter/list.php
|
2014-11-23 17:43:36 +01:00 |
|
Frédéric FRANCE
|
e6da4a2518
|
Update /comm/list.php
|
2014-11-23 17:43:32 +01:00 |
|
Frédéric FRANCE
|
baaadd772e
|
Update /holiday/index.php
|
2014-11-23 17:43:28 +01:00 |
|
Frédéric FRANCE
|
28e620a7bf
|
Update /cron/list.php
|
2014-11-23 17:43:24 +01:00 |
|
Frédéric FRANCE
|
d17b5268fa
|
(GETPOST("button_removefilter_x") || GETPOST("button_removefilter"))
if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
|
2014-11-23 17:43:19 +01:00 |
|
Frédéric FRANCE
|
486d24b8db
|
Fix Typo
|
2014-11-23 17:43:06 +01:00 |
|
Frédéric FRANCE
|
326e009cad
|
Fix Typo
|
2014-11-23 17:42:06 +01:00 |
|
Laurent Destailleur
|
33eae22b26
|
Merge pull request #2070 from frederic34/patch-5
(GETPOST("button_removefilter_x") || GETPOST("button_removefilter"))
|
2014-11-23 17:40:28 +01:00 |
|
Marcos García de La Fuente
|
912384a9fa
|
Fixed [ bug #1679 ] Can't sort groups by user count in user groups list
|
2014-11-23 17:24:37 +01:00 |
|
Marcos García de La Fuente
|
496a3fcaae
|
Removed unused action of card.php
|
2014-11-23 17:06:51 +01:00 |
|
Marcos García de La Fuente
|
b76a58b898
|
Fixed typo
|
2014-11-23 17:03:25 +01:00 |
|
Laurent Destailleur
|
652b0f84a7
|
Fixed: Field is used only by module accounting so must have a condition
on it.
|
2014-11-23 17:03:22 +01:00 |
|
Marcos García de La Fuente
|
231ad04fbd
|
Highlight of required fields should be only in edit mode
|
2014-11-23 16:58:46 +01:00 |
|
Marcos García de La Fuente
|
1347a16fd3
|
Fixed[ bug #1661 ] Bookmarks list "Target" translation missing
|
2014-11-23 16:55:40 +01:00 |
|
Marcos García de La Fuente
|
a927a04421
|
Fixed [ bug #1705 ] Members statistics menu entry strange target
|
2014-11-23 16:55:32 +01:00 |
|
Marcos García de La Fuente
|
5578bc6f5d
|
Fixed [ bug #1658 ] Linked files in supplier invoices wrongly shows amounts
|
2014-11-23 16:55:12 +01:00 |
|
Marcos García de La Fuente
|
26ab5bdd43
|
Merge branch 'develop' into bookmarks
|
2014-11-23 16:54:59 +01:00 |
|
Laurent Destailleur
|
90dcb44076
|
Merge pull request #2080 from marcosgdf/bug-1661
Fixed[ bug #1661 ] Bookmarks list "Target" translation missing
|
2014-11-23 16:54:09 +01:00 |
|
Marcos García de La Fuente
|
373bdcf5d7
|
Fixed problem when editing a bookmark and failing
|
2014-11-23 16:54:09 +01:00 |
|
Laurent Destailleur
|
9c107790e4
|
Merge pull request #2079 from marcosgdf/bug-1705
Fixed [ bug #1705 ] Members statistics menu entry strange target
|
2014-11-23 16:53:54 +01:00 |
|
Laurent Destailleur
|
375d9aa336
|
Merge pull request #2077 from marcosgdf/3.6
Fixed [ bug #1595 ] Selected boolean extrafield in intervention creation page, does not save state
|
2014-11-23 16:53:07 +01:00 |
|
Laurent Destailleur
|
5b4241582a
|
Merge pull request #2076 from marcosgdf/bug-1658
Fixed [ bug #1658 ] Linked files in supplier invoices wrongly shows amounts
|
2014-11-23 16:52:55 +01:00 |
|
Laurent Destailleur
|
245a06d433
|
Merge remote-tracking branch 'origin/3.7' into develop
|
2014-11-23 16:52:15 +01:00 |
|
Laurent Destailleur
|
1635f725c8
|
Merge remote-tracking branch 'origin/3.6' into 3.7
|
2014-11-23 16:51:25 +01:00 |
|
Laurent Destailleur
|
1f986014f1
|
Merge remote-tracking branch 'origin/3.5' into 3.6
|
2014-11-23 16:50:08 +01:00 |
|
Laurent Destailleur
|
99e7004bb6
|
Merge pull request #2073 from frederic34/patch-8
Fix: W3C. form into table is forbidden.
|
2014-11-23 16:49:33 +01:00 |
|
Laurent Destailleur
|
7678f9b13c
|
Merge pull request #2069 from frederic34/patch-4
Fix 1662 Search filter display discrepancy
|
2014-11-23 16:48:59 +01:00 |
|
Laurent Destailleur
|
becbf9eada
|
Merge pull request #2068 from frederic34/patch-3
Fix 1667 Pagination is only partially shown in supplier references list
|
2014-11-23 16:48:44 +01:00 |
|
Laurent Destailleur
|
bd8391163a
|
Merge pull request #2067 from frederic34/patch-2
Fix bug 1692 Can't update phone_pro with the contact webservice
|
2014-11-23 16:48:33 +01:00 |
|
Laurent Destailleur
|
989cd87446
|
Merge pull request #2066 from altatof/fix_margin_recap
FIX: bad margin and buy_price calculation when total_ht = 0 (discount 100%) on a line
|
2014-11-23 16:48:21 +01:00 |
|
Marcos García de La Fuente
|
52eb4943e2
|
Fixed entities problems in error messages when creating a bookmark
|
2014-11-23 16:46:48 +01:00 |
|
Marcos García de La Fuente
|
c40be71dcd
|
Fixed design of new bookmark page
|
2014-11-23 16:44:49 +01:00 |
|
Marcos García de La Fuente
|
eb569fe235
|
Fixed [ bug #1712 ] Unable to add a social charge
|
2014-11-23 16:43:52 +01:00 |
|
Marcos García de La Fuente
|
a1cc95d352
|
Fixed design of edit page of a bookmark
|
2014-11-23 16:26:55 +01:00 |
|
Marcos García de La Fuente
|
4f83eea3cf
|
Fixed[ bug #1661 ] Bookmarks list "Target" translation missing
|
2014-11-23 16:22:38 +01:00 |
|
Marcos García de La Fuente
|
bd765ef3ae
|
Fixed [ bug #1705 ] Members statistics menu entry strange target
|
2014-11-23 16:17:09 +01:00 |
|
Marcos García de La Fuente
|
7d71974362
|
Fixed [ bug #1712 ] Unable to add a social charge
|
2014-11-23 16:14:12 +01:00 |
|
Marcos García de La Fuente
|
dcfaeb6606
|
Merge remote-tracking branch 'upstream/3.6' into 3.6
|
2014-11-23 16:04:23 +01:00 |
|
Marcos García de La Fuente
|
7a272afd12
|
Fixed [ bug #1595 ] Selected boolean extrafield in intervention creation page, does not save state
|
2014-11-23 16:03:49 +01:00 |
|
Marcos García de La Fuente
|
835b359179
|
Fixed [ bug #1658 ] Linked files in supplier invoices wrongly shows amounts
|
2014-11-23 15:42:29 +01:00 |
|
Laurent Destailleur
|
1c1e2ed246
|
Better comment
|
2014-11-23 13:19:28 +01:00 |
|
Marcos García de La Fuente
|
9f73277ef2
|
Fixed [ bug #1642 ]: add a free line in contract
|
2014-11-23 13:14:54 +01:00 |
|
Laurent Destailleur
|
3aef9d928b
|
Fix: W3C
|
2014-11-23 13:14:03 +01:00 |
|
Frédéric FRANCE
|
de48a04844
|
Fix: W3C. form into table is forbidden.
|
2014-11-23 12:53:00 +01:00 |
|
Laurent Destailleur
|
97a6bd842d
|
Minor fixes.
|
2014-11-23 12:39:53 +01:00 |
|
Frédéric FRANCE
|
ffb4dd9e3d
|
Update /compta/paiement/cheque/list.php
|
2014-11-23 10:06:40 +01:00 |
|
Frédéric FRANCE
|
38febad979
|
Update /fourn/facture/impayees.php
|
2014-11-23 10:05:40 +01:00 |
|
Frédéric FRANCE
|
edaf6aec10
|
Update /fourn/facture/paiement.php
|
2014-11-23 10:04:43 +01:00 |
|
Frédéric FRANCE
|
018d1488fc
|
Update /fourn/commande/list.php
|
2014-11-23 10:03:03 +01:00 |
|
Frédéric FRANCE
|
8bbc2d8db4
|
Update /product/stock/mouvement.php
|
2014-11-23 10:02:16 +01:00 |
|
Frédéric FRANCE
|
c6f7134414
|
Update /comm/prospect/list.php
|
2014-11-23 10:01:07 +01:00 |
|
Frédéric FRANCE
|
8356c1b560
|
Update /comm/actions/listactions.php
|
2014-11-23 10:00:09 +01:00 |
|
Frédéric FRANCE
|
e1addea6db
|
Update /accountancy/bookeeping/list.php
|
2014-11-23 09:59:05 +01:00 |
|
Frédéric FRANCE
|
5f11354547
|
Update /accountancy/admin/account.php
|
2014-11-23 09:58:19 +01:00 |
|
Frédéric FRANCE
|
0ea40c155e
|
Update /compta/facture/impayees.php
|
2014-11-23 09:57:21 +01:00 |
|
Frédéric FRANCE
|
fef3cfbe81
|
Update /compta/facture/list.php
|
2014-11-23 09:55:13 +01:00 |
|
Frédéric FRANCE
|
865ec76a51
|
Update /compta/salaries/index.php
|
2014-11-23 09:54:17 +01:00 |
|
Frédéric FRANCE
|
c9a0208328
|
Update /compta/paiement/list.php
|
2014-11-23 09:53:19 +01:00 |
|
Frédéric FRANCE
|
cfe5784d49
|
Update /compta/bank/search.php
|
2014-11-23 09:52:35 +01:00 |
|
Frédéric FRANCE
|
fe725f1d8a
|
Update /compta/sociales/index.php
|
2014-11-23 09:51:49 +01:00 |
|
Frédéric FRANCE
|
adf0e8bb54
|
Update /compta/tva/reglement.php
|
2014-11-23 09:51:03 +01:00 |
|
Frédéric FRANCE
|
37eef59b50
|
Update /compta/prelevement/list.php
|
2014-11-23 09:50:19 +01:00 |
|
Frédéric FRANCE
|
d6e8211018
|
Update /compta/deplacement/list.php
|
2014-11-23 09:49:30 +01:00 |
|
Frédéric FRANCE
|
979eadf42e
|
Update /compta/dons/list.php
|
2014-11-23 09:48:54 +01:00 |
|
Frédéric FRANCE
|
5b0b222772
|
Update /societe/societe.php
|
2014-11-23 09:48:13 +01:00 |
|
Frédéric FRANCE
|
fbee671db1
|
Update /societe/consumption.php
|
2014-11-23 09:47:19 +01:00 |
|
Frédéric FRANCE
|
09f1f79f4e
|
Update /adherents/list.php
|
2014-11-23 09:46:24 +01:00 |
|
Frédéric FRANCE
|
89deffa3a7
|
Update /fourn/list.php
|
2014-11-23 09:36:07 +01:00 |
|
Frédéric FRANCE
|
7442b1a6b1
|
Update /contrat/list.php
|
2014-11-23 09:34:56 +01:00 |
|
Frédéric FRANCE
|
6f3ce0a63b
|
Update /contrat/services.php
|
2014-11-23 09:34:20 +01:00 |
|
Frédéric FRANCE
|
91aca474dd
|
Update /expedition/list.php
|
2014-11-23 09:33:32 +01:00 |
|
Frédéric FRANCE
|
b43f8eede3
|
Update /fichinter/list.php
|
2014-11-23 09:32:46 +01:00 |
|
Frédéric FRANCE
|
46aea31e6c
|
Update /comm/list.php
|
2014-11-23 09:31:20 +01:00 |
|
Frédéric FRANCE
|
a10209ae9f
|
Update /holiday/index.php
|
2014-11-23 09:30:32 +01:00 |
|
Frédéric FRANCE
|
54541f9f14
|
Update /cron/list.php
|
2014-11-23 09:29:04 +01:00 |
|
Frédéric FRANCE
|
d9fdf82391
|
(GETPOST("button_removefilter_x") || GETPOST("button_removefilter"))
if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
|
2014-11-23 01:21:51 +01:00 |
|
Frédéric FRANCE
|
ffd435d9ff
|
Fix 1662 Search filter display discrepancy
|
2014-11-23 01:20:02 +01:00 |
|
Frédéric FRANCE
|
b2a1408d8e
|
Fix 1667 Pagination is only partially shown in supplier references list
|
2014-11-23 00:51:13 +01:00 |
|
Frédéric FRANCE
|
891f8d9442
|
Fix bug 1692 Can't update phone_pro with the contact webservice
|
2014-11-22 19:02:15 +01:00 |
|
Laurent Destailleur
|
2a56a19b7d
|
Merge remote-tracking branch 'origin/3.7' into develop
|
2014-11-22 16:59:12 +01:00 |
|
Laurent Destailleur
|
671243e8f6
|
Fixed: Bugs reported by scrutinizer
Fixed: Solve conflict between ->iban and ->iban_prefix.
|
2014-11-22 16:57:08 +01:00 |
|
Laurent Destailleur
|
02e18bc03d
|
Merge remote-tracking branch 'origin/3.7' into develop
|
2014-11-22 16:29:06 +01:00 |
|
Laurent Destailleur
|
8b545af325
|
Merge pull request #1982 from atm-alexis/feature_agenda_files_on_card_view
add files view into agenda card
|
2014-11-22 16:24:09 +01:00 |
|
Laurent Destailleur
|
d8767bfbae
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/product/class/product.class.php
|
2014-11-22 16:10:14 +01:00 |
|
Laurent Destailleur
|
9aab62ab36
|
Merge remote-tracking branch 'origin/3.5' into 3.6
|
2014-11-22 16:03:09 +01:00 |
|
Laurent Destailleur
|
2f4de2ef75
|
Merge pull request #2016 from altatof/3.5
FIX: copy extrafields when creating order from propale and creating
|
2014-11-22 16:02:13 +01:00 |
|
Laurent Destailleur
|
31a5a46ffa
|
Merge pull request #2022 from asirinelli/3.7
Add EIRL in llx_c_forme_juridique
|
2014-11-22 16:00:32 +01:00 |
|
Andrelec1
|
667f1bf497
|
Fix : more than 1000 holidays
Si il y a plus de 1000 jours de congés, le délimiteur des millier fais
bugger les calcule ...
|
2014-11-22 15:59:51 +01:00 |
|
Laurent Destailleur
|
3d968aa432
|
Merge pull request #2027 from Devensys/Develop-FixGRHconge1
FIX bug in GRH module
|
2014-11-22 15:59:12 +01:00 |
|
Laurent Destailleur
|
e8b2206629
|
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
|
2014-11-22 15:57:33 +01:00 |
|
Laurent Destailleur
|
86a3a4f618
|
Merge branch '1680' of github.com:aspangaro/dolibarr into aspangaro-1680
Conflicts:
htdocs/comm/propal/list.php
|
2014-11-22 15:57:06 +01:00 |
|
Laurent Destailleur
|
e6e5cb471d
|
Merge pull request #2040 from aspangaro/1681
#1681 Clear sort filter works partially in customers list
|
2014-11-22 15:54:57 +01:00 |
|
Laurent Destailleur
|
432b623dac
|
Merge pull request #2041 from aspangaro/1684
#1684 Clear sort filter works partially in interventions list
|
2014-11-22 15:54:38 +01:00 |
|
Laurent Destailleur
|
34306359a4
|
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
|
2014-11-22 15:54:14 +01:00 |
|
Laurent Destailleur
|
9ddb76ca12
|
Merge pull request #2042 from frederic34/patch-9
#1664 Can't sort by mobile phones in contact list
|
2014-11-22 15:53:55 +01:00 |
|
Laurent Destailleur
|
d3e216c19a
|
Clear compatible with all browsers
|
2014-11-22 15:53:37 +01:00 |
|
Laurent Destailleur
|
0e44e05600
|
Merge pull request #2043 from frederic34/patch-2
#1665 Can't clear sort filter on contacts list
|
2014-11-22 15:52:36 +01:00 |
|
Laurent Destailleur
|
d7b0aab71a
|
Clear works with all browsers
|
2014-11-22 15:52:08 +01:00 |
|
Laurent Destailleur
|
a7df54ef0d
|
Merge pull request #2044 from frederic34/patch-3
#1666 Clear sort filter works partially in product/services
|
2014-11-22 15:51:07 +01:00 |
|
Laurent Destailleur
|
6c7bab8d8c
|
Merge pull request #2045 from frederic34/patch-4
#1682 Date is missing in proposals list
|
2014-11-22 15:50:50 +01:00 |
|
Laurent Destailleur
|
86f2f191ea
|
Merge pull request #2046 from frederic34/patch-5
#1683 Can't clear sort filter on proposals list
|
2014-11-22 15:50:37 +01:00 |
|
Laurent Destailleur
|
e4804f99ff
|
Merge pull request #2047 from frederic34/patch-6
#1685-1686 Clear sort filter works partially in supplier invoices
|
2014-11-22 15:50:16 +01:00 |
|
Laurent Destailleur
|
830d470c33
|
Merge pull request #2047 from frederic34/patch-6
#1685-1686 Clear sort filter works partially in supplier invoices
|
2014-11-22 15:48:28 +01:00 |
|
Laurent Destailleur
|
d6cb29a17b
|
Merge pull request #2048 from frederic34/patch-7
#1689 Can't sort supplier invoice payments on amounts
|
2014-11-22 15:47:55 +01:00 |
|
Laurent Destailleur
|
8c440dea4a
|
Fxied: Syntax error
|
2014-11-22 15:47:14 +01:00 |
|
Laurent Destailleur
|
a6867fef0f
|
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
|
2014-11-22 15:46:07 +01:00 |
|
Laurent Destailleur
|
b9cf6ddd65
|
Merge branch '1698' of github.com:aspangaro/dolibarr into aspangaro-1698
Conflicts:
htdocs/langs/en_US/donations.lang
|
2014-11-22 15:44:59 +01:00 |
|
Laurent Destailleur
|
dfae42cd4a
|
Merge pull request #2051 from aspangaro/1690
#1672 VAT accounts by default are lost in migration
|
2014-11-22 15:41:58 +01:00 |
|
Laurent Destailleur
|
7fbeb2cbcb
|
Merge pull request #2053 from aspangaro/1688
#1688 The ref filter searches on rowid not on ref in unpaid supplier inv...
|
2014-11-22 15:41:39 +01:00 |
|
BENKE Charles
|
730bf1c25c
|
Update html.formcontract.class.php
bad filtering on contract list (same sql rule as project)
|
2014-11-22 15:41:18 +01:00 |
|
Laurent Destailleur
|
f845cde3f1
|
Merge pull request #2056 from defrance69/patch-29
bad filtering on contract list (same sql rule as project)
|
2014-11-22 15:40:41 +01:00 |
|
Laurent Destailleur
|
a47c7f02e2
|
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
|
2014-11-22 15:37:34 +01:00 |
|
Laurent Destailleur
|
eaa4b6cb56
|
Add PR manually because of conflict "#1678 & #1677 Untranslatable token"
|
2014-11-22 15:37:18 +01:00 |
|
Laurent Destailleur
|
f0d32e3b65
|
Merge pull request #2059 from aspangaro/1657
#1657 Intervention preview date is not displayed
|
2014-11-22 15:33:49 +01:00 |
|
Laurent Destailleur
|
135e58871e
|
Merge pull request #2061 from aspangaro/1704
#1704 Untranslatable token in externalsite module admin
|
2014-11-22 15:33:18 +01:00 |
|
Laurent Destailleur
|
4b2e0b555a
|
Merge pull request #2062 from aspangaro/1706
#1706 Missing table cell in shipment list header + Search fields doesn't...
|
2014-11-22 15:31:41 +01:00 |
|
Laurent Destailleur
|
088dd1d2e9
|
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
|
2014-11-22 15:30:37 +01:00 |
|
Laurent Destailleur
|
b5e64b66c8
|
Merge pull request #2025 from GPCsolutions/dbupgrade
Work around tms bugs with MariaDB
|
2014-11-22 15:26:42 +01:00 |
|
Laurent Destailleur
|
43f3e28fd6
|
Fixed: [ bug #1645 ] Can't list contracts
|
2014-11-22 15:12:36 +01:00 |
|