Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
57,524 Commits 36 Branches 189 Tags
04d73668cc80fa8636e101345dbdcf00a73c8ab0
Commit Graph

577 Commits

Author SHA1 Message Date
Laurent Destailleur
9a9b31c9c0 Fix cancel button + logic to close project when setting opp to WON/LOST. 2017-02-01 13:25:16 +01:00
Laurent Destailleur
fd90bf466b Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/societe/soc.php
 2017-01-28 15:12:14 +01:00
Laurent Destailleur
1e78c4c418 FIX Change the customer code only if error on duplicate 2017-01-28 14:54:06 +01:00
Laurent Destailleur
27caa586c2 Fix auto increment customer code must be done only if error is on 
duplicate code
 2017-01-28 12:36:53 +01:00
Laurent Destailleur
0c14e1d233 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-01-27 01:24:55 +01:00
altatof
09dde659d5 FIX: add entity param to document link 2017-01-25 09:26:26 +01:00
Laurent Destailleur
3a2d9c8610 Fix for rtl languages 2017-01-21 16:12:25 +01:00
Laurent Destailleur
dba777c57b Fix missing field alias 2017-01-08 12:10:07 +01:00
Laurent Destailleur
5120093872 FIX balance of TR 2016-12-10 22:58:55 +01:00
Jean-Pierre Morfin
4b4dc8fe0d FIX Calling soc.php with an unknown socid display a message 
Fix #4632
Calling soc.php with an unknown socid display a simple error message
 2016-12-10 11:49:16 +01:00
Laurent Destailleur
5ebb86c45a FIX #6022 2016-11-22 20:24:42 +01:00
Laurent Destailleur
ff4fa9977c FIX #5895 2016-11-20 15:47:05 +01:00
Laurent Destailleur
0fea6f22a9 Change code to reduce need of jmobile 2016-11-05 03:27:56 +01:00
Laurent Destailleur
aec0e79653 Normalize constant name. 2016-10-29 21:47:10 +02:00
Laurent Destailleur
0ae5a3799c Fix html 2016-10-24 12:42:37 +02:00
Laurent Destailleur
3b05d00163 Better responsive design 2016-10-24 12:06:33 +02:00
Sergio Sanchis Climent
8556dab68e NEW: #5830 2016-10-13 16:44:17 +02:00
Laurent Destailleur
6ac39b97e4 Fix restore list of attached files into action report 2016-10-03 00:38:28 +02:00
Laurent Destailleur
f92ca518f7 Uniformize look and feel 2016-10-02 16:38:58 +02:00
Laurent Destailleur
39c4feaef7 Enhancement for usage on smartphone 2016-09-21 03:54:54 +02:00
Laurent Destailleur
b5dad8cfbf Better responsive 2016-09-21 00:29:19 +02:00
Laurent Destailleur
0ab377440d Complete param of setValueFrom 2016-09-12 20:16:39 +02:00
Laurent Destailleur
0079a3a9c5 A better explanation on choice on thirdparty creation process 2016-09-09 18:41:42 +02:00
Laurent Destailleur
b107b0644f Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-02 22:07:17 +02:00
Laurent Destailleur
ba76f12a28 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/product/price.php
	htdocs/product/stock/class/mouvementstock.class.php
 2016-09-02 19:24:28 +02:00
Laurent Destailleur
70de814c3c Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-09-02 19:03:31 +02:00
phf
fcd5e1fb2c Fix lost value if use double quote 2016-09-02 15:30:42 +02:00
Laurent Destailleur
8fd082cf16 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/hrm/hrm.php
 2016-08-31 16:16:19 +02:00
Laurent Destailleur
45fceaeea5 Fix another field not responsive 2016-08-31 16:14:31 +02:00
Laurent Destailleur
c4ae712bac Fix responsive design 2016-08-31 16:09:56 +02:00
Laurent Destailleur
fac28f9589 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/sociales/charges.php
	htdocs/core/boxes/modules_boxes.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
 2016-08-28 02:40:20 +02:00
aspangaro
dd905debb4 Uniformize presentation 2016-08-09 10:19:42 +02:00
Laurent Destailleur
3f87b0c225 NEW Show photo of contacts on thirdparty card. 2016-08-06 00:04:24 +02:00
florian HENRY
419dd3095b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_fix5353

Conflicts:
	htdocs/societe/class/societe.class.php
 2016-07-26 08:59:40 +02:00
Laurent Destailleur
0428d9c887 Merge pull request #5525 from aspangaro/4.0-p36 
Fix: Presentation on thirdparty card
 2016-07-21 10:42:56 +02:00
Laurent Destailleur
774e327831 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/comm/remx.php
	htdocs/compta/facture.php
	htdocs/langs/en_US/companies.lang
 2016-07-21 10:30:51 +02:00
aspangaro
52e5403660 Fix: Presentation on thirdparty card 2016-07-21 06:25:25 +02:00
Laurent Destailleur
fec2d86ec5 Fix substitution of __THIRDPARTY_NAME__ failed 2016-07-07 18:56:10 +02:00
florian HENRY
d431e73ec8 Fix #5353 2016-06-30 15:49:57 +02:00
Alexis Algoud
fa73dbe8e9 FIX #5128 if create method return duplicated code error 
not use GETPOST in order to get a new code
 2016-06-30 15:12:35 +02:00
Laurent Destailleur
6317cb53f2 FIX Merge of 2 thirdparties when there is one common tag. 2016-06-20 15:42:16 +02:00
Laurent Destailleur
8187dc2006 Fix css 2016-06-19 16:07:34 +02:00
Laurent Destailleur
232f525f29 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/lib/project.lib.php
 2016-06-15 18:31:43 +02:00
Laurent Destailleur
630a063283 FIX Can't create thirdparty or validate invoice if profid is mandatory 
and profid does not exists for other countries

Conflicts:
	htdocs/compta/facture.php
 2016-06-15 18:24:15 +02:00
Laurent Destailleur
4c922f073b FIX Can't create thirdparty or validate invoice if profid is mandatory 
and profid does not exists for other countries
 2016-06-15 18:21:58 +02:00
Laurent Destailleur
b57476153f Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/admin/menus/edit.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/societe/consumption.php
 2016-06-04 01:14:36 +02:00
Laurent Destailleur
085fa6902b Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/contrat/list.php
	htdocs/fourn/ajax/getSupplierPrices.php
 2016-06-04 00:58:16 +02:00
phf
778b05c341 Fix #4632 2016-06-03 23:06:53 +02:00
Laurent Destailleur
1617f3c62a Fix colspan 2016-05-24 20:24:51 +02:00
Laurent Destailleur
901c7c9517 Link "Backtolist" was missing on products 2016-05-17 02:16:28 +02:00