Regis Houssin
|
afbd43c3ce
|
Merge branch 'develop' of git+ssh://github.com/Dolibarr/dolibarr into develop
Conflicts:
htdocs/core/lib/functions.lib.php
|
2011-11-20 16:56:44 +01:00 |
|
Regis Houssin
|
c206f4ae60
|
Fix: better with json_encode for use string for cols and rows name
|
2011-11-20 16:54:41 +01:00 |
|
Regis Houssin
|
4bf1585d0f
|
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/functions.lib.php
|
2011-11-20 16:37:27 +01:00 |
|
Regis Houssin
|
3c7c220bad
|
Fix: better with json_encode for use string for cols and rows name
|
2011-11-20 16:34:30 +01:00 |
|
Regis Houssin
|
065d7996f5
|
Fix: better with json_encode
|
2011-11-20 15:25:08 +01:00 |
|
Regis Houssin
|
666e850d72
|
Fix: uniform code
|
2011-11-20 11:58:52 +01:00 |
|
Regis Houssin
|
2f100d0d72
|
Merge pull request #52 from simnandez/develop
Cherry Pick 3.1 to develop
|
2011-11-20 01:40:31 -08:00 |
|
Juanjo Menent
|
75fa989e79
|
Fix: load file other.lang solve missing translations
|
2011-11-20 10:23:48 +01:00 |
|
Juanjo Menent
|
d7fce41b8a
|
Fix: [bug 235] Bad local tax control
Conflicts:
htdocs/fourn/commande/fiche.php
|
2011-11-20 10:17:14 +01:00 |
|
Laurent Destailleur
|
afaae396a4
|
Fix: Form to create member online
|
2011-11-20 02:10:55 +01:00 |
|
Laurent Destailleur
|
117fb7001b
|
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
|
2011-11-19 19:15:52 +01:00 |
|
Laurent Destailleur
|
3699f13454
|
Fix: [ bug #233 ] Delete invoice problem with a discount
|
2011-11-19 19:05:33 +01:00 |
|
Regis Houssin
|
0207191202
|
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
|
2011-11-19 09:45:44 +01:00 |
|
Regis Houssin
|
7a34f4d5e4
|
Fix: remove duplicate field
|
2011-11-19 09:45:01 +01:00 |
|
Laurent Destailleur
|
b425fbe376
|
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
|
2011-11-18 23:44:00 +01:00 |
|
Laurent Destailleur
|
51d30c41a7
|
Fix: Correct sign
|
2011-11-18 13:08:51 +01:00 |
|
Laurent Destailleur
|
f60b664c16
|
Fix: Correct sign on line
|
2011-11-18 02:16:35 +01:00 |
|
Laurent Destailleur
|
5c47a60851
|
Fix: Can add discount if no product line provided yet
|
2011-11-17 20:56:47 +01:00 |
|
Laurent Destailleur
|
ada016d921
|
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
|
2011-11-17 20:19:36 +01:00 |
|
Regis Houssin
|
75fe0c67d4
|
Fix: bad link
|
2011-11-17 17:13:39 +01:00 |
|
Regis Houssin
|
3db9a49275
|
Fix: bad object typo
|
2011-11-17 15:52:38 +01:00 |
|
Laurent Destailleur
|
9fcff390cd
|
Fix: should not change var $html here. It is not class
html.form.class.php
|
2011-11-16 23:58:25 +01:00 |
|
Laurent Destailleur
|
36c8bbdf3c
|
Fix: Make a field not null as it is used with inner join.
|
2011-11-16 23:38:54 +01:00 |
|
Laurent Destailleur
|
a8ecfe2fb4
|
Look: Minor fix
|
2011-11-16 23:38:10 +01:00 |
|
Laurent Destailleur
|
8b3de5ecf6
|
Better label
|
2011-11-16 23:25:41 +01:00 |
|
Laurent Destailleur
|
febf00ca33
|
Update doc
|
2011-11-16 19:28:36 +01:00 |
|
Laurent Destailleur
|
bf9c482f8a
|
Fix: Deposits was not included into lines but into into remain to pay
|
2011-11-16 18:58:11 +01:00 |
|
Laurent Destailleur
|
3d01d77427
|
New: Stock change on invoice validation support all warehouse into point
of sale module
|
2011-11-15 20:27:32 +01:00 |
|
Laurent Destailleur
|
05c177ef52
|
Look: Minor look enhancement on point of sale login page
|
2011-11-15 13:33:32 +01:00 |
|
Laurent Destailleur
|
11a6bf651b
|
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
|
2011-11-15 13:32:04 +01:00 |
|
Regis Houssin
|
3ebec27677
|
Fix: permissions problem
|
2011-11-15 16:13:55 +08:00 |
|
Regis Houssin
|
182670010b
|
Merge pull request #50 from simnandez/develop
Trad: Add confirm message when going back to draft
|
2011-11-14 10:10:21 -08:00 |
|
Juanjo Menent
|
780f1d02e7
|
Trad: Add confirm message when going back to draft
|
2011-11-14 18:44:04 +01:00 |
|
Laurent Destailleur
|
0308ed1088
|
Look: Uniformize css
|
2011-11-14 18:37:04 +01:00 |
|
Laurent Destailleur
|
5dc660af46
|
Fix: Stock sign for credit note must be reverted
|
2011-11-14 17:47:45 +01:00 |
|
Laurent Destailleur
|
7622a5b472
|
Look: Removed useless title
|
2011-11-14 17:03:57 +01:00 |
|
Laurent Destailleur
|
7f77391acb
|
Ask warehouse even when going back to draft
|
2011-11-14 16:57:26 +01:00 |
|
Laurent Destailleur
|
12963265d7
|
Add confirm message when going back to draft
|
2011-11-14 16:23:59 +01:00 |
|
Laurent Destailleur
|
7384096d56
|
Enhance doc for stock movement
|
2011-11-14 15:46:44 +01:00 |
|
Laurent Destailleur
|
ca335e4fe0
|
New: Support zip/town autocompletion on warehouses
|
2011-11-14 11:28:16 +01:00 |
|
Laurent Destailleur
|
8cdbc2151c
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2011-11-14 01:38:33 +01:00 |
|
Laurent Destailleur
|
163a0c5db2
|
Fix: restore rpm packaging
|
2011-11-13 12:29:33 +01:00 |
|
Laurent Destailleur
|
eb52193440
|
Update links
|
2011-11-13 12:02:05 +01:00 |
|
Laurent Destailleur
|
e49a7bfc80
|
Qual: Removed useless file
|
2011-11-13 11:57:21 +01:00 |
|
Laurent Destailleur
|
b81938fe95
|
Uniformize code and doxygen
|
2011-11-13 11:45:25 +01:00 |
|
Laurent Destailleur
|
40a4bcec04
|
Qual: doxygen
Fix: Preselected field was not selected
|
2011-11-13 00:49:40 +01:00 |
|
Laurent Destailleur
|
37b8f855e1
|
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
|
2011-11-12 18:23:17 +01:00 |
|
Laurent Destailleur
|
4515da176f
|
Move script to correct dir
|
2011-11-12 18:21:40 +01:00 |
|
Laurent Destailleur
|
3219ab4e0a
|
Move doxygen files into doxygen dir
|
2011-11-12 18:20:59 +01:00 |
|
Regis Houssin
|
c1d703825b
|
Merge pull request #49 from grandoc/develop
Develop
|
2011-11-12 05:52:58 -08:00 |
|