Laurent Destailleur
|
9a5670787f
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-01-21 12:26:50 +01:00 |
|
Laurent Destailleur
|
1add34b451
|
Fix multicompany
|
2017-01-20 21:05:20 +01:00 |
|
Laurent Destailleur
|
fc4aa96cd7
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/fichinter/card.php
htdocs/fourn/commande/dispatch.php
|
2017-01-20 21:02:05 +01:00 |
|
Laurent Destailleur
|
eb09519a26
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
|
2017-01-20 20:44:30 +01:00 |
|
Laurent Destailleur
|
9ebe383beb
|
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
|
2017-01-20 20:44:19 +01:00 |
|
Laurent Destailleur
|
809e3ce4d5
|
Debug browser notification
|
2017-01-20 20:10:16 +01:00 |
|
Laurent Destailleur
|
b602e04fc8
|
Merge pull request #6272 from simnandez/develop
NEW: Event notifications in browser
|
2017-01-20 18:14:21 +01:00 |
|
Laurent Destailleur
|
ea97491a8f
|
Merge pull request #6288 from marcosgdf/fr-6280
NEW #6280: Generate PDF after creating an invoice from a customer order
|
2017-01-20 18:11:47 +01:00 |
|
Laurent Destailleur
|
02c4c21c0a
|
Merge pull request #6267 from gnovaro/develop
Improve code style
|
2017-01-20 18:11:10 +01:00 |
|
Laurent Destailleur
|
0a4b29e1c4
|
Merge pull request #6284 from atm-gauthier/FIX_pdf_invoice_with_situation
Fix pdf invoice with situation
|
2017-01-20 18:10:24 +01:00 |
|
Ion
|
f23f2e61f5
|
Fix #6161 supplier order to facture not working
|
2017-01-20 18:09:26 +01:00 |
|
Laurent Destailleur
|
06abcbd4e9
|
Merge pull request #6305 from IonAgorria/fix-ordtoinv
Fix #6161: supplier order to facture not working
|
2017-01-20 18:08:55 +01:00 |
|
Speed
|
5715233fb0
|
Updated script sync members from LDAP
Replace "Cotisation" class with its new name "Subscription"
|
2017-01-20 18:07:53 +01:00 |
|
Laurent Destailleur
|
bf0b5c0666
|
Merge pull request #6301 from sealeo-org/develop
Fix : script sync members from LDAP
|
2017-01-20 18:06:23 +01:00 |
|
Laurent Destailleur
|
a250ba5f56
|
Close #6307 #6306
|
2017-01-20 17:52:52 +01:00 |
|
Laurent Destailleur
|
a47f3cb0e5
|
Merge pull request #6309 from atm-arnaud/FIX_calcul_marge_by_user_with_multicompany
FIX bug margin calcul by user with multicompany
|
2017-01-20 17:46:56 +01:00 |
|
Juanjo Menent
|
d7edcdd03c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-01-20 15:56:13 +01:00 |
|
Juanjo Menent
|
2374aa351e
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2017-01-20 15:55:51 +01:00 |
|
Laurent Destailleur
|
ac32161711
|
Fix error in total of tasks
|
2017-01-20 14:36:56 +01:00 |
|
Laurent Destailleur
|
e66aabea85
|
Fix error in total of tasks
|
2017-01-20 14:35:18 +01:00 |
|
Laurent Destailleur
|
5b8ff63981
|
Fix bad value
|
2017-01-20 14:17:58 +01:00 |
|
Laurent Destailleur
|
6780b20968
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-01-20 14:11:55 +01:00 |
|
Laurent Destailleur
|
2f4ff66c43
|
Minor fixes
|
2017-01-20 14:10:57 +01:00 |
|
Laurent Destailleur
|
94249b7926
|
NEW Add statistics on tabs
|
2017-01-20 14:03:07 +01:00 |
|
Laurent Destailleur
|
b4733e043c
|
Fix tooltip when customer is closed
|
2017-01-20 12:17:10 +01:00 |
|
Laurent Destailleur
|
412be59f78
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
|
2017-01-20 12:09:39 +01:00 |
|
Laurent Destailleur
|
9bb9d4d36e
|
Fix position of field and tooltip
|
2017-01-20 12:08:33 +01:00 |
|
arnaud
|
2cedcfece2
|
FIX bug margin calcul by user with multicompany
|
2017-01-20 12:01:20 +01:00 |
|
Ion
|
4d8df737f3
|
Fix #6161 supplier order to facture not working
|
2017-01-20 11:27:11 +01:00 |
|
Laurent Destailleur
|
4047de82bd
|
Fix navigation on projects
|
2017-01-20 10:27:37 +01:00 |
|
Laurent Destailleur
|
8ec1784e41
|
Better translation
|
2017-01-20 09:46:36 +01:00 |
|
gauthier
|
a944c82d86
|
FIX : $progress_width initialized
|
2017-01-19 09:11:06 +01:00 |
|
Speed
|
32653c1b94
|
Updated script sync members from LDAP
Replace "Cotisation" class with its new name "Subscription"
|
2017-01-18 19:38:50 +01:00 |
|
Laurent Destailleur
|
03c1521cde
|
Merge pull request #6271 from altatof/fix_extra_input
FIX: extrafield input for varchar was not working with special char
|
2017-01-18 16:53:43 +01:00 |
|
Laurent Destailleur
|
227b616ca3
|
Fix bad default value
|
2017-01-18 16:51:42 +01:00 |
|
Laurent Destailleur
|
ed98227303
|
Merge pull request #6292 from marcosgdf/remove-pdf-create-functions
NEW Removed deprecated pdf_create functions
|
2017-01-18 16:48:23 +01:00 |
|
Laurent Destailleur
|
562bdbc9f5
|
Merge pull request #6291 from gnovaro/patch-1
Improve code style
|
2017-01-18 16:44:56 +01:00 |
|
Laurent Destailleur
|
f2d361d29b
|
Merge pull request #6286 from defrance/patch-68
Add contract default mail (and some old path to order)
|
2017-01-18 16:41:47 +01:00 |
|
Laurent Destailleur
|
acb2c57f47
|
Merge pull request #6290 from marcosgdf/little-change-generatedoc
Uniformize code: Little improvement to generateDocument function
|
2017-01-18 16:38:39 +01:00 |
|
Laurent Destailleur
|
47c37855b1
|
Merge pull request #6287 from grandoc/develop
update code for next php versions
|
2017-01-18 16:36:39 +01:00 |
|
Laurent Destailleur
|
9d6f84c3a0
|
FIX Try a better fif for #6074
|
2017-01-18 16:27:23 +01:00 |
|
Laurent Destailleur
|
d4413d370e
|
Merge pull request #6296 from fmarcet/peru
Fix: Show correct bank account order
|
2017-01-18 15:56:08 +01:00 |
|
Laurent Destailleur
|
2566df8252
|
Merge pull request #6298 from benlo06/fix_shipping_contactid
FIX getIdContact for shipping
|
2017-01-18 15:53:32 +01:00 |
|
Laurent Destailleur
|
9be75ed019
|
Merge pull request #6299 from bgenere/FIX-c6bd1a7-on-Task-delete
FIX can not delete a task if time spent on it
|
2017-01-18 15:52:46 +01:00 |
|
Laurent Destailleur
|
3336943ff2
|
Fix responsive
|
2017-01-18 15:49:12 +01:00 |
|
Laurent Destailleur
|
d48f2507b5
|
Fix link attachment on bank document page
|
2017-01-18 15:37:45 +01:00 |
|
Laurent Destailleur
|
ddbb7ee1f4
|
Fix bad alignement
|
2017-01-18 15:26:50 +01:00 |
|
Laurent Destailleur
|
b6383399aa
|
Fix bad colspan
|
2017-01-18 15:23:37 +01:00 |
|
Laurent Destailleur
|
8f577b0754
|
Fix bad link
|
2017-01-18 15:19:17 +01:00 |
|
Laurent Destailleur
|
6f3677a322
|
FIX total payed wrong
|
2017-01-18 13:28:02 +01:00 |
|